mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
Merge branch 'master' of https://github.com/mathiasbynens/jquery into mathiasbynens-master
This commit is contained in:
commit
fc7bd61200
@ -143,7 +143,7 @@ function show_copyright(comments) {
|
|||||||
if (c.type == "comment1") {
|
if (c.type == "comment1") {
|
||||||
ret += "//" + c.value + "\n";
|
ret += "//" + c.value + "\n";
|
||||||
} else {
|
} else {
|
||||||
ret += "/*" + c.value + "*/";
|
ret += "/*" + c.value + "*/\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
@ -181,7 +181,7 @@ function squeeze_it(code) {
|
|||||||
});
|
});
|
||||||
if (options.ast)
|
if (options.ast)
|
||||||
return sys.inspect(ast, null, null);
|
return sys.inspect(ast, null, null);
|
||||||
result += time_it("generate", function(){ return pro.gen_code(ast, options.beautify && options.beautify_options) });
|
result += time_it("generate", function(){ return pro.gen_code(ast, options.beautify && options.beautify_options) }) + ";";
|
||||||
return result;
|
return result;
|
||||||
} catch(ex) {
|
} catch(ex) {
|
||||||
sys.debug(ex.stack);
|
sys.debug(ex.stack);
|
||||||
|
Loading…
Reference in New Issue
Block a user