From 74dfc7f2a992b8aebbd98ec75e5e0175e2616142 Mon Sep 17 00:00:00 2001 From: Dan Heberden Date: Wed, 19 Jan 2011 02:11:43 -0800 Subject: [PATCH] Revert uglify.js to original and handle build changes in make file --- Makefile | 5 ++++- build/uglify.js | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2e6848d..c708db5 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,10 @@ min: ${JQ_MIN} ${JQ_MIN}: ${JQ} @@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: @@echo "Removing Distribution directory:" ${DIST_DIR} diff --git a/build/uglify.js b/build/uglify.js index cba0586..943ddd8 100644 --- a/build/uglify.js +++ b/build/uglify.js @@ -143,7 +143,7 @@ function show_copyright(comments) { if (c.type == "comment1") { ret += "//" + c.value + "\n"; } else { - ret += "/*" + c.value + "*/\n"; + ret += "/*" + c.value + "*/"; } } return ret; @@ -181,7 +181,7 @@ function squeeze_it(code) { }); if (options.ast) 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; } catch(ex) { sys.debug(ex.stack); -- 1.7.10.4