From: John Resig Date: Sun, 4 Jan 2009 15:29:27 +0000 (+0000) Subject: Moved from the old JSMin to using YUIMin for compressing the jQuery source. Additiona... X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=commitdiff_plain;h=434b87b8a233eb24ec773de801f3adb460fbd0f4 Moved from the old JSMin to using YUIMin for compressing the jQuery source. Additionally landed some improvements from #3770 which dramatically reduce the filesize. The final minifed + gzipped size of jQuery went from 19817 bytes to 18063 bytes. --- diff --git a/Makefile b/Makefile index 36bd11c..2d344c6 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,7 @@ JQ_VER = `cat version.txt` VER = sed s/@VERSION/${JQ_VER}/ JAR = java -jar ${BUILD_DIR}/js.jar +MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar all: jquery lite min pack speed @@echo "jQuery build complete." @@ -104,7 +105,7 @@ ${JQ_MIN}: ${JQ} @@echo "Building" ${JQ_MIN} @@echo " - Compressing using Minifier" - @@${JAR} ${BUILD_DIR}/build/min.js ${JQ} ${JQ_MIN} + @@${MINJAR} ${JQ} > ${JQ_MIN} @@echo ${JQ_MIN} "Built" @@echo diff --git a/build/yuicompressor-2.4.2.jar b/build/yuicompressor-2.4.2.jar new file mode 100644 index 0000000..c29470b Binary files /dev/null and b/build/yuicompressor-2.4.2.jar differ diff --git a/src/ajax.js b/src/ajax.js index 6c8a22e..c255dfe 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -497,7 +497,7 @@ jQuery.extend({ // Get the JavaScript object, if JSON is used. if ( type == "json" ) - data = eval("(" + data + ")"); + data = window["eval"]("(" + data + ")"); } return data; diff --git a/src/core.js b/src/core.js index 592c9a0..8c4c09b 100644 --- a/src/core.js +++ b/src/core.js @@ -9,6 +9,9 @@ * $Rev$ */ +// Will speed up references to window, and allows munging its name. +var window = this; + // Map over jQuery in case of overwrite var _jQuery = window.jQuery, // Map over the $ in case of overwrite diff --git a/src/offset.js b/src/offset.js index c7f26d1..cc1b874 100644 --- a/src/offset.js +++ b/src/offset.js @@ -50,7 +50,7 @@ else jQuery.offset = { initialize: function() { if ( this.initialized ) return; - var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, rules, prop, bodyMarginTop = body.style.marginTop, + var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, td, rules, prop, bodyMarginTop = body.style.marginTop, html = '
'; rules = { position: 'absolute', top: 0, left: 0, margin: 0, border: 0, width: '1px', height: '1px', visibility: 'hidden' };