diff options
| author | Dan Heberden <danheberden@gmail.com> | 2011-01-19 02:11:43 -0800 |
|---|---|---|
| committer | Dan Heberden <danheberden@gmail.com> | 2011-01-19 02:11:43 -0800 |
| commit | 74dfc7f2a992b8aebbd98ec75e5e0175e2616142 (patch) | |
| tree | e854efa9f1e6aa0171180aba21278af5842ff8fc | |
| parent | 265cf0efa7ab3296b3fc4917b863d7b09e3d8bb4 (diff) | |
| download | jquery-74dfc7f2a992b8aebbd98ec75e5e0175e2616142.tar.gz jquery-74dfc7f2a992b8aebbd98ec75e5e0175e2616142.zip | |
Revert uglify.js to original and handle build changes in make file
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | build/uglify.js | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -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 cba0586ff..943ddd806 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); |