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.
This commit is contained in:
parent
c0294278db
commit
434b87b8a2
3
Makefile
3
Makefile
|
@ -50,6 +50,7 @@ JQ_VER = `cat version.txt`
|
||||||
VER = sed s/@VERSION/${JQ_VER}/
|
VER = sed s/@VERSION/${JQ_VER}/
|
||||||
|
|
||||||
JAR = java -jar ${BUILD_DIR}/js.jar
|
JAR = java -jar ${BUILD_DIR}/js.jar
|
||||||
|
MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar
|
||||||
|
|
||||||
all: jquery lite min pack speed
|
all: jquery lite min pack speed
|
||||||
@@echo "jQuery build complete."
|
@@echo "jQuery build complete."
|
||||||
|
@ -104,7 +105,7 @@ ${JQ_MIN}: ${JQ}
|
||||||
@@echo "Building" ${JQ_MIN}
|
@@echo "Building" ${JQ_MIN}
|
||||||
|
|
||||||
@@echo " - Compressing using Minifier"
|
@@echo " - Compressing using Minifier"
|
||||||
@@${JAR} ${BUILD_DIR}/build/min.js ${JQ} ${JQ_MIN}
|
@@${MINJAR} ${JQ} > ${JQ_MIN}
|
||||||
|
|
||||||
@@echo ${JQ_MIN} "Built"
|
@@echo ${JQ_MIN} "Built"
|
||||||
@@echo
|
@@echo
|
||||||
|
|
BIN
build/yuicompressor-2.4.2.jar
Normal file
BIN
build/yuicompressor-2.4.2.jar
Normal file
Binary file not shown.
|
@ -497,7 +497,7 @@ jQuery.extend({
|
||||||
|
|
||||||
// Get the JavaScript object, if JSON is used.
|
// Get the JavaScript object, if JSON is used.
|
||||||
if ( type == "json" )
|
if ( type == "json" )
|
||||||
data = eval("(" + data + ")");
|
data = window["eval"]("(" + data + ")");
|
||||||
}
|
}
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
|
|
|
@ -9,6 +9,9 @@
|
||||||
* $Rev$
|
* $Rev$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
// Will speed up references to window, and allows munging its name.
|
||||||
|
var window = this;
|
||||||
|
|
||||||
// Map over jQuery in case of overwrite
|
// Map over jQuery in case of overwrite
|
||||||
var _jQuery = window.jQuery,
|
var _jQuery = window.jQuery,
|
||||||
// Map over the $ in case of overwrite
|
// Map over the $ in case of overwrite
|
||||||
|
|
|
@ -50,7 +50,7 @@ else
|
||||||
jQuery.offset = {
|
jQuery.offset = {
|
||||||
initialize: function() {
|
initialize: function() {
|
||||||
if ( this.initialized ) return;
|
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>';
|
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' };
|
rules = { position: 'absolute', top: 0, left: 0, margin: 0, border: 0, width: '1px', height: '1px', visibility: 'hidden' };
|
||||||
|
|
Loading…
Reference in a new issue