deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'make_fix' of https://github.com/danheberden/jquery into danheberden-make_fix

Browse source
This commit is contained in:
John Resig 2011-01-20 14:39:28 -05:00
parent 3dbd600e19 74dfc7f2a9
commit 35875acd03
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -96,7 +96,10 @@ min: ${JQ_MIN}
${JQ_MIN}: ${JQ} ${JQ_MIN}: ${JQ}
@@echo "Building" ${JQ_MIN} @@echo "Building" ${JQ_MIN}
@@${COMPILER} ${JQ} > ${JQ_MIN} @@${COMPILER} ${JQ} > ${JQ_MIN}.tmp
@@echo ";" >> ${JQ_MIN}.tmp
@@sed 's/\*\/(/*\/ʩ(/' ${JQ_MIN}.tmp | tr "ʩ" "\n" > ${JQ_MIN}
@@rm -rf ${JQ_MIN}.tmp
clean: clean:
@@echo "Removing Distribution directory:" ${DIST_DIR} @@echo "Removing Distribution directory:" ${DIST_DIR}

4
build/uglify.js
View file

@ -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 + "*/\n"; ret += "/*" + c.value + "*/";
} }
} }
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);