diff options
| author | John Resig <jeresig@gmail.com> | 2009-01-04 15:29:27 +0000 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2009-01-04 15:29:27 +0000 |
| commit | 434b87b8a233eb24ec773de801f3adb460fbd0f4 (patch) | |
| tree | 5abe141c6b257f669015f04f9551d184f546b090 | |
| parent | c0294278db40da764a98ea1c1506548e539213c7 (diff) | |
| download | jquery-434b87b8a233eb24ec773de801f3adb460fbd0f4.tar.gz jquery-434b87b8a233eb24ec773de801f3adb460fbd0f4.zip | |
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.
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | build/yuicompressor-2.4.2.jar | bin | 0 -> 851219 bytes | |||
| -rw-r--r-- | src/ajax.js | 2 | ||||
| -rw-r--r-- | src/core.js | 3 | ||||
| -rw-r--r-- | src/offset.js | 2 |
5 files changed, 7 insertions, 3 deletions
@@ -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 Binary files differnew file mode 100644 index 000000000..c29470bd0 --- /dev/null +++ b/build/yuicompressor-2.4.2.jar diff --git a/src/ajax.js b/src/ajax.js index 6c8a22e8a..c255dfeba 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 592c9a033..8c4c09b46 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 c7f26d1c8..cc1b87440 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 = '<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"cellpadding="0"cellspacing="0"><tr><td></td></tr></table>'; rules = { position: 'absolute', top: 0, left: 0, margin: 0, border: 0, width: '1px', height: '1px', visibility: 'hidden' }; |