]> source.dussan.org Git - jquery.git/commitdiff
Strips IIFEs from modules; Always require built jQuery for tests.
authorRick Waldron <waldron.rick@gmail.com>
Mon, 4 Jun 2012 16:48:18 +0000 (12:48 -0400)
committerRick Waldron <waldron.rick@gmail.com>
Mon, 4 Jun 2012 16:48:18 +0000 (12:48 -0400)
47 files changed:
.gitignore
Makefile
README.md
grunt.js
src/ajax.js
src/ajax/jsonp.js
src/ajax/script.js
src/ajax/xhr.js
src/attributes.js
src/callbacks.js
src/core.js
src/css.js
src/data.js
src/deferred.js
src/dimensions.js
src/effects.js
src/event.js
src/exports.js
src/intro.js
src/manipulation.js
src/offset.js
src/queue.js
src/support.js
src/traversing.js
test/csp.php
test/data/dimensions/documentLarge.html
test/data/dimensions/documentSmall.html
test/data/event/asyncReady.html
test/data/event/promiseReady.html
test/data/event/syncReady.html
test/data/offset/absolute.html
test/data/offset/body.html
test/data/offset/fixed.html
test/data/offset/relative.html
test/data/offset/scroll.html
test/data/offset/static.html
test/data/offset/table.html
test/data/selector/html5_selector.html
test/data/selector/sizzle_cache.html
test/data/support/bodyBackground.html
test/data/support/testElementCrash.html
test/delegatetest.html
test/hovertest.html
test/index.html
test/localfile.html
test/networkerror.html
test/readywait.html

index e40d864aa69fb6262fcebd678d1663f74659ca39..0973197c15df6ef3f2843245bdad4db7ec8d0b97 100644 (file)
@@ -7,5 +7,6 @@ dist
 *.patch
 /*.html
 .DS_Store
+dist/.sizecache.json
 build/.sizecache.json
 node_modules
index 3d8566abfd17746e6d003670479b4d3dc89e02f3..f33a61c1aaf3bb450df8ecaedb4a320867636316 100644 (file)
--- a/Makefile
+++ b/Makefile
-SRC_DIR = src
-TEST_DIR = test
-BUILD_DIR = build
 
-PREFIX = .
-DIST_DIR = ${PREFIX}/dist
+all: update_submodules
 
-JS_ENGINE ?= `which node nodejs 2>/dev/null`
-COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe
-POST_COMPILER = ${JS_ENGINE} ${BUILD_DIR}/post-compile.js
-
-BASE_FILES = ${SRC_DIR}/core.js\
-       ${SRC_DIR}/callbacks.js\
-       ${SRC_DIR}/deferred.js\
-       ${SRC_DIR}/support.js\
-       ${SRC_DIR}/data.js\
-       ${SRC_DIR}/queue.js\
-       ${SRC_DIR}/attributes.js\
-       ${SRC_DIR}/event.js\
-       ${SRC_DIR}/selector.js\
-       ${SRC_DIR}/traversing.js\
-       ${SRC_DIR}/manipulation.js\
-       ${SRC_DIR}/css.js\
-       ${SRC_DIR}/ajax.js\
-       ${SRC_DIR}/ajax/jsonp.js\
-       ${SRC_DIR}/ajax/script.js\
-       ${SRC_DIR}/ajax/xhr.js\
-       ${SRC_DIR}/effects.js\
-       ${SRC_DIR}/offset.js\
-       ${SRC_DIR}/dimensions.js\
-       ${SRC_DIR}/exports.js
-
-MODULES = ${SRC_DIR}/intro.js\
-       ${BASE_FILES}\
-       ${SRC_DIR}/outro.js
-
-JQ = ${DIST_DIR}/jquery.js
-JQ_MIN = ${DIST_DIR}/jquery.min.js
-
-SIZZLE_DIR = ${SRC_DIR}/sizzle
-
-JQ_VER = $(shell cat version.txt)
-VER = sed "s/@VERSION/${JQ_VER}/"
-
-DATE=$(shell git log -1 --pretty=format:%ad)
-
-all: update_submodules core
-
-core: jquery min hint size
-       @@echo "jQuery build complete."
-
-${DIST_DIR}:
-       @@mkdir -p ${DIST_DIR}
-
-jquery: ${JQ}
-
-${JQ}: ${MODULES} | ${DIST_DIR}
-       @@echo "Building" ${JQ}
-
-       @@cat ${MODULES} | \
-               sed 's/.function..jQuery...{//' | \
-               sed 's/}...jQuery..;//' | \
-               sed 's/@DATE/'"${DATE}"'/' | \
-               ${VER} > ${JQ};
-
-${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js
-       @@echo "Building selector code from Sizzle"
-       @@sed '/EXPOSE/r src/sizzle-jquery.js' ${SIZZLE_DIR}/sizzle.js | grep -v window.Sizzle > ${SRC_DIR}/selector.js
-
-hint: jquery
-       @@if test ! -z ${JS_ENGINE}; then \
-               echo "Checking jQuery against JSHint..."; \
-               ${JS_ENGINE} build/jshint-check.js; \
-       else \
-               echo "You must have NodeJS installed in order to test jQuery against JSHint."; \
-       fi
-
-size: jquery min
-       @@if test ! -z ${JS_ENGINE}; then \
-               gzip -c ${JQ_MIN} > ${JQ_MIN}.gz; \
-               wc -c ${JQ} ${JQ_MIN} ${JQ_MIN}.gz | ${JS_ENGINE} ${BUILD_DIR}/sizer.js; \
-               rm ${JQ_MIN}.gz; \
-       else \
-               echo "You must have NodeJS installed in order to size jQuery."; \
-       fi
-
-freq: jquery min
-       @@if test ! -z ${JS_ENGINE}; then \
-               ${JS_ENGINE} ${BUILD_DIR}/freq.js; \
-       else \
-               echo "You must have NodeJS installed to report the character frequency of minified jQuery."; \
-       fi
-
-min: jquery ${JQ_MIN}
-
-${JQ_MIN}: ${JQ}
-       @@if test ! -z ${JS_ENGINE}; then \
-               echo "Minifying jQuery" ${JQ_MIN}; \
-               ${COMPILER} ${JQ} > ${JQ_MIN}.tmp; \
-               ${POST_COMPILER} ${JQ_MIN}.tmp; \
-               rm -f ${JQ_MIN}.tmp; \
-       else \
-               echo "You must have NodeJS installed in order to minify jQuery."; \
-       fi
-
-clean:
-       @@echo "Removing Distribution directory:" ${DIST_DIR}
-       @@rm -rf ${DIST_DIR}
-
-       @@echo "Removing built copy of Sizzle"
-       @@rm -f src/selector.js
-
-distclean: clean
+submoduleclean: clean
        @@echo "Removing submodules"
        @@rm -rf test/qunit src/sizzle
 
 # change pointers for submodules and update them to what is specified in jQuery
-# --merge  doesn't work when doing an initial clone, thus test if we have non-existing
-#  submodules, then do an real update
+# --merge      doesn't work when doing an initial clone, thus test if we have non-existing
+#      submodules, then do an real update
 update_submodules:
        @@if [ -d .git ]; then \
                if git submodule status | grep -q -E '^-'; then \
@@ -129,9 +20,6 @@ update_submodules:
 # update the submodules to the latest at the most logical branch
 pull_submodules:
        @@git submodule foreach "git pull \$$(git config remote.origin.url)"
-       @@git submodule summary
-
-pull: pull_submodules
-       @@git pull ${REMOTE} ${BRANCH}
+       #@@git submodule summary
 
-.PHONY: all jquery hint min clean distclean update_submodules pull_submodules pull core
+.PHONY: all submoduleclean update_submodules pull_submodules
index b97886bb0151d7e7daca9d7722b5faa1fd3b4072..0d1b1bf052a89e160e5323c8e5c4f580c6544c4d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -11,21 +11,10 @@ In the spirit of open source software development, jQuery always encourages comm
 3. [Tips For Bug Patching](http://docs.jquery.com/Tips_for_jQuery_Bug_Patching)
 
 
-Running the Unit Tests
---------------------------------------
-
-Run the unit tests with a local server that supports PHP. No database is required. Pre-configured php local servers are available for Windows and Mac. Here are some options:
-
-- Windows: [WAMP download](http://www.wampserver.com/en/)
-- Mac: [MAMP download](http://www.mamp.info/en/index.html)
-- Linux: [Setting up LAMP](https://www.linux.com/learn/tutorials/288158-easy-lamp-server-installation)
-- [Mongoose (most platforms)](http://code.google.com/p/mongoose/)
-
-
 What you need to build your own jQuery
 --------------------------------------
 
-In order to build jQuery, you need to have GNU make 3.8 or later, Node.js 0.4.12 or later, and git 1.7 or later.
+In order to build jQuery, you need to have GNU make 3.8 or later, Node.js/npm latest, and git 1.7 or later.
 (Earlier versions might work OK, but are not tested.)
 
 Windows users have two options:
@@ -50,32 +39,66 @@ if you swing that way. Easy-peasy.
 How to build your own jQuery
 ----------------------------
 
-First, clone a copy of the main jQuery git repo by running `git clone git://github.com/jquery/jquery.git`.
+First, clone a copy of the main jQuery git repo by running:
+
+`git clone git://github.com/jquery/jquery.git`
+
+Enter the directory and install the node dependencies:
+
+`cd jquery && npm install`
+
+
+Make sure you have `grunt` installed by testing:
+
+`grunt -version`
+
+
+
+Then, to get a complete, minified (w/ Ugligy.js), linted (w/ JSHint) version of jQuery, type the following:
+
+`grunt`
 
-Then, to get a complete, minified, jslinted version of jQuery, simply `cd` to the `jquery` directory and type
-`make`. If you don't have Node installed and/or want to make a basic, uncompressed, unlinted version of jQuery, use
-`make jquery` instead of `make`.
 
 The built version of jQuery will be put in the `dist/` subdirectory.
 
-To remove all built files, run `make clean`.
+
+Running the Unit Tests
+--------------------------------------
+
+
+Start grunt to auto-build jQuery as you work:
+
+`cd jquery && grunt watch`
+
+
+
+Run the unit tests with a local server that supports PHP. No database is required. Pre-configured php local servers are available for Windows and Mac. Here are some options:
+
+- Windows: [WAMP download](http://www.wampserver.com/en/)
+- Mac: [MAMP download](http://www.mamp.info/en/index.html)
+- Linux: [Setting up LAMP](https://www.linux.com/learn/tutorials/288158-easy-lamp-server-installation)
+- [Mongoose (most platforms)](http://code.google.com/p/mongoose/)
+
+
 
 
 Building to a different directory
 ---------------------------------
 
-If you want to build jQuery to a directory that is different from the default location, you can specify the PREFIX
-directory: `make PREFIX=/home/jquery/test/ [command]`
+If you want to build jQuery to a directory that is different from the default location:
 
-With this example, the output files would end up in `/home/jquery/test/dist/`.
+`grunt && grunt dist:/Users/you/Dropbox/Public/`
 
+With this example, the output files would be:
+
+```bash
+
+/Users/you/Dropbox/Public/jquery.js
+/Users/you/Dropbox/Public/jquery.min.js
+
+```
 
-Troubleshooting
----------------
 
-Sometimes, the various git repositories get into an inconsistent state where builds don't complete properly
-(usually this results in the jquery.js or jquery.min.js being 0 bytes). If this happens, run `make clean`, then
-run `make` again.
 
 Git for dummies
 ---------------
index bdc6e8a1d9ba1b42cab7bd5b5b3c19d104cb7e28..a09b5d822c2cf7353e0ec8be06e88e6b12719a55 100644 (file)
--- a/grunt.js
+++ b/grunt.js
@@ -13,6 +13,10 @@ module.exports = function( grunt ) {
        var option = grunt.option;
        var config = grunt.config;
        var template = grunt.template;
+       var distpaths = [
+               "dist/jquery.js",
+               "dist/jquery.min.js"
+       ];
 
        grunt.initConfig({
                pkg: "<json:package.json>",
@@ -20,10 +24,7 @@ module.exports = function( grunt ) {
                        banner: "/*! jQuery v@<%= pkg.version %> jquery.com | jquery.org/license */"
                },
                compare_size: {
-                       files: [
-                               "dist/jquery.js",
-                               "dist/jquery.min.js"
-                       ]
+                       files: distpaths
                },
                selector: {
                        "src/selector.js": [
@@ -67,8 +68,8 @@ module.exports = function( grunt ) {
                        files: "test/index.html"
                },
                watch: {
-                       files: "<config:lint.files>",
-                       tasks: "concat lint"
+                       files: [ "<config:lint.files>", "src/**/*.js" ],
+                       tasks: "default"
                },
                jshint: {
                        options: {
@@ -103,7 +104,7 @@ module.exports = function( grunt ) {
        });
 
        // Default grunt.
-       grunt.registerTask( "default", "selector build:*:* lint min compare_size" );
+       grunt.registerTask( "default", "submodules selector build:*:* dist:* lint min compare_size" );
 
        grunt.loadNpmTasks("grunt-compare-size");
 
@@ -184,13 +185,14 @@ module.exports = function( grunt ) {
                                }
 
                                // Unwrap redundant IIFEs
-                               compiled += file.read( filepath ).replace( /^\(function\( jQuery \) \{|\}\)\( jQuery \);\s*$/g, "" );
+                               compiled += file.read( filepath );
+                               //.replace( /^\(function\( jQuery \) \{|\}\)\( jQuery \);\s*$/g, "" );
                        });
 
                        // Embed Date
                        // Embed Version
                        compiled = compiled.replace( "@DATE", new Date() )
-                                                                               .replace( "@VERSION", config("pkg.version") );
+                               .replace( "@VERSION", config("pkg.version") );
 
                        // Write concatenated source to file
                        file.write( name, compiled );
@@ -203,4 +205,51 @@ module.exports = function( grunt ) {
                        // Otherwise, print a success message.
                        log.writeln( "File '" + name + "' created." );
                });
+
+       grunt.registerTask( "submodules", function() {
+               var done = this.async();
+
+               grunt.verbose.write( "Updating submodules..." );
+
+               // TODO: migrate remaining `make` to grunt tasks
+               //
+               grunt.utils.spawn({
+                       cmd: "make"
+               }, function( err, result ) {
+                       if ( err ) {
+                               grunt.verbose.error();
+                               done( err );
+                               return;
+                       }
+
+                       grunt.log.writeln( result );
+
+                       done();
+               });
+       });
+
+       // Allow custom dist file locations
+       grunt.registerTask( "dist", function() {
+               var keys, dir;
+
+               keys = Object.keys( this.flags );
+
+               if ( keys.length ) {
+                       dir = keys[0];
+
+                       if ( !/\/$/.test( dir ) ) {
+                               dir += "/";
+                       }
+
+                       // 'distpaths' is declared at the top of the
+                       // module.exports function scope.
+                       distpaths.forEach(function( filename ) {
+                               var created = dir + filename.replace( "dist/", "" );
+
+                               file.write( created, file.read( filename ) );
+
+                               log.writeln( "File '" + created + "' created." );
+                       });
+               }
+       });
 };
index c402f2153bc0f2f1cbc9fb56c0dd1dca085cb3e2..cb8af47c97f1d50eed7f65a7f2e43bef173e3cae 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 var r20 = /%20/g,
        rbracket = /\[\]$/,
        rCRLF = /\r?\n/g,
@@ -993,5 +991,3 @@ function ajaxConvert( s, response ) {
 
        return { state: "success", data: response };
 }
-
-})( jQuery );
index 3e3ea85a3eb67f60bc0570e2747d5bff7389c667..c39913faca6665e06c27da6822a6a78ee46b11ba 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 var oldCallbacks = [],
        rquestion = /\?/,
        rjsonp = /(=)\?(?=&|$)|\?\?/,
@@ -87,5 +85,3 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
                return "script";
        }
 });
-
-})( jQuery );
index f7a9180107800aafaa270f38a249cf8ee1219b00..48b329ae3fa59d68432950c864ffe803b15d5be7 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 // Install script dataType
 jQuery.ajaxSetup({
        accepts: {
@@ -85,5 +83,3 @@ jQuery.ajaxTransport( "script", function(s) {
                };
        }
 });
-
-})( jQuery );
index 186432f61de6882a754a752ac9ba46b7d387314c..fb431034d8fffb5f866262588773d93e100cd895 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 var // #5280: Internet Explorer will keep connections alive if we don't abort on unload
        xhrOnUnloadAbort = window.ActiveXObject ? function() {
                // Abort all pending requests
@@ -222,5 +220,3 @@ if ( jQuery.support.ajax ) {
                }
        });
 }
-
-})( jQuery );
index cc2256f88e444c9fb465cd42879d1d467a16727c..1b79ae44ad98ddc6d3c95be5abe46175531d9fa6 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 var rclass = /[\n\t\r]/g,
        rspace = /\s+/,
        rreturn = /\r/g,
@@ -652,5 +650,3 @@ jQuery.each([ "radio", "checkbox" ], function() {
                }
        });
 });
-
-})( jQuery );
index 5516d551f9c81e9fe4f329b4f9adef350e221db3..12f2956ce2052e262e10cf4d7623c014060e5331 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 // String to Object options format cache
 var optionsCache = {};
 
@@ -192,5 +190,3 @@ jQuery.Callbacks = function( options ) {
 
        return self;
 };
-
-})( jQuery );
index 3fcc9e46c37965ceeda4c077edbd6d43e270f158..c9ed81d2a47a19169933c9618aadf9e7d2c8ca5b 100644 (file)
@@ -1,7 +1,18 @@
-var jQuery = (function() {
+// Use the correct document accordingly with window argument (sandbox)
+var document = window.document,
+       navigator = window.navigator,
+       location = window.location,
 
-// Define a local copy of jQuery
-var jQuery = function( selector, context ) {
+       // Save a reference to some core methods
+       toString = Object.prototype.toString,
+       hasOwn = Object.prototype.hasOwnProperty,
+       push = Array.prototype.push,
+       slice = Array.prototype.slice,
+       trim = String.prototype.trim,
+       indexOf = Array.prototype.indexOf,
+
+       // Define a local copy of jQuery
+       jQuery = function( selector, context ) {
                // The jQuery object is actually just the init constructor 'enhanced'
                return new jQuery.fn.init( selector, context, rootjQuery );
        },
@@ -71,14 +82,6 @@ var jQuery = function( selector, context ) {
                jQuery.ready();
        },
 
-       // Save a reference to some core methods
-       toString = Object.prototype.toString,
-       hasOwn = Object.prototype.hasOwnProperty,
-       push = Array.prototype.push,
-       slice = Array.prototype.slice,
-       trim = String.prototype.trim,
-       indexOf = Array.prototype.indexOf,
-
        // [[Class]] -> type pairs
        class2type = {};
 
@@ -933,7 +936,3 @@ function doScrollCheck() {
        // and execute any waiting functions
        jQuery.ready();
 }
-
-return jQuery;
-
-})();
index 67559e950009166a7a42f1996fbd433324c06217..4497878e480ad1179a3c40661826f750fc8676d7 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 // order is important!
 jQuery.cssExpand = [ "Top", "Right", "Bottom", "Left" ];
 
@@ -66,7 +64,7 @@ function showHide( elements, show ) {
                        // for such an element
                        if ( (elem.style.display === "" && curCSS( elem, "display" ) === "none") ||
                                !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
-                               values[ index ] = jQuery._data( elem, "olddisplay", jQuery.defaultDisplay(elem.nodeName) );
+                               values[ index ] = jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) );
                        }
                } else {
                        display = curCSS( elem, "display" );
@@ -264,49 +262,6 @@ jQuery.extend({
                }
 
                return ret;
-       },
-
-       // Try to determine the default display value of an element
-       defaultDisplay: function( nodeName ) {
-               if ( elemdisplay[ nodeName ] ) {
-                       return elemdisplay[ nodeName ];
-               }
-
-               var elem = jQuery( "<" + nodeName + ">" ).appendTo( document.body ),
-                       display = elem.css("display");
-               elem.remove();
-
-               // If the simple way fails,
-               // get element's real default display by attaching it to a temp iframe
-               if ( display === "none" || display === "" ) {
-                       // Use the already-created iframe if possible
-                       iframe = document.body.appendChild(
-                               iframe || jQuery.extend( document.createElement("iframe"), {
-                                       frameBorder: 0,
-                                       width: 0,
-                                       height: 0
-                               })
-                       );
-
-                       // Create a cacheable copy of the iframe document on first call.
-                       // IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML
-                       // document to it; WebKit & Firefox won't allow reusing the iframe document.
-                       if ( !iframeDoc || !iframe.createElement ) {
-                               iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
-                               iframeDoc.write("<!doctype html><html><body>");
-                               iframeDoc.close();
-                       }
-
-                       elem = iframeDoc.body.appendChild( iframeDoc.createElement(nodeName) );
-
-                       display = curCSS( elem, "display" );
-                       document.body.removeChild( iframe );
-               }
-
-               // Store the correct default display
-               elemdisplay[ nodeName ] = display;
-
-               return display;
        }
 });
 
@@ -466,6 +421,50 @@ function getWidthOrHeight( elem, name, extra ) {
        ) + "px";
 }
 
+
+// Try to determine the default display value of an element
+function defaultDisplay( nodeName ) {
+       if ( elemdisplay[ nodeName ] ) {
+               return elemdisplay[ nodeName ];
+       }
+
+       var elem = jQuery( "<" + nodeName + ">" ).appendTo( document.body ),
+               display = elem.css("display");
+       elem.remove();
+
+       // If the simple way fails,
+       // get element's real default display by attaching it to a temp iframe
+       if ( display === "none" || display === "" ) {
+               // Use the already-created iframe if possible
+               iframe = document.body.appendChild(
+                       iframe || jQuery.extend( document.createElement("iframe"), {
+                               frameBorder: 0,
+                               width: 0,
+                               height: 0
+                       })
+               );
+
+               // Create a cacheable copy of the iframe document on first call.
+               // IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML
+               // document to it; WebKit & Firefox won't allow reusing the iframe document.
+               if ( !iframeDoc || !iframe.createElement ) {
+                       iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
+                       iframeDoc.write("<!doctype html><html><body>");
+                       iframeDoc.close();
+               }
+
+               elem = iframeDoc.body.appendChild( iframeDoc.createElement(nodeName) );
+
+               display = curCSS( elem, "display" );
+               document.body.removeChild( iframe );
+       }
+
+       // Store the correct default display
+       elemdisplay[ nodeName ] = display;
+
+       return display;
+}
+
 jQuery.each([ "height", "width" ], function( i, name ) {
        jQuery.cssHooks[ name ] = {
                get: function( elem, computed, extra ) {
@@ -594,5 +593,3 @@ jQuery.each({
                jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
        }
 });
-
-})( jQuery );
index ff4309f1eadfa2df40d787e7d24a43da29803e77..4b5b22fdaf3530236a2cfc25e198c089abf39924 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 var rbrace = /^(?:\{.*\}|\[.*\])$/,
        rmultiDash = /([A-Z])/g;
 
@@ -368,5 +366,3 @@ function isEmptyDataObject( obj ) {
 
        return true;
 }
-
-})( jQuery );
index 6c42583a586e0c4913e7ff1dace2b5e618325788..a8410c8bed2a5c45d769ec8bba1c27059c985058 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 var // Static reference to slice
        sliceDeferred = [].slice;
 
@@ -116,7 +114,7 @@ jQuery.extend({
                                        }
                                };
                        },
-                       
+
                        progressValues, progressContexts, resolveContexts;
 
                // add listeners to Deferred subordinates; treat others as resolved
@@ -144,5 +142,3 @@ jQuery.extend({
                return deferred.promise();
        }
 });
-
-})( jQuery );
index d81fb327ecf416f071e57139129e64571d4cf8e2..172df647d96a40b7bf6bf7e93825ff887992e9d6 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 // Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
 jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
        jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
@@ -44,5 +42,3 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
                };
        });
 });
-
-})( jQuery );
index c2f04a04981dc3dab365393011a29c65fa1667e6..bd2ac816d69e887f1ec3cc39acace700665d3cf9 100644 (file)
@@ -253,7 +253,7 @@ function defaultPrefilter( elem, props, opts ) {
 
                        // inline-level elements accept inline-block;
                        // block-level elements need to be inline with layout
-                       if ( !jQuery.support.inlineBlockNeedsLayout || jQuery.defaultDisplay( elem.nodeName ) === "inline" ) {
+                       if ( !jQuery.support.inlineBlockNeedsLayout || defaultDisplay( elem.nodeName ) === "inline" ) {
                                style.display = "inline-block";
 
                        } else {
index b4a76c7101c61132485ed01db386c2d035aacbe4..03049a5c460945ee80e8756585e75c0eb8f3e92f 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 var rformElems = /^(?:textarea|input|select)$/i,
        rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/,
        rhoverHack = /(?:^|\s)hover(\.\S+)?\b/,
@@ -1071,5 +1069,3 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
                jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks;
        }
 });
-
-})( jQuery );
index 7d8964f012dc198febd8bc64eedffe5ae1caa6e5..88def50ba37b475d82c158024004dfd49c80e169 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 // Expose jQuery to the global object
 window.jQuery = window.$ = jQuery;
 
@@ -18,5 +16,3 @@ window.jQuery = window.$ = jQuery;
 if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
        define( "jquery", [], function () { return jQuery; } );
 }
-
-})( jQuery );
index a81c86f920fc73d625651afb1346ec704011a1bf..8c32720682e29afede312a158a39e02a94781238 100644 (file)
@@ -14,8 +14,3 @@
  * Date: @DATE
  */
 (function( window, undefined ) {
-
-// Use the correct document accordingly with window argument (sandbox)
-var document = window.document,
-       navigator = window.navigator,
-       location = window.location;
index a6b8edc6ffc912061d1e6b232eb467bb255da352..e53daa9b626e5fddcddb7c65768472995cc29ff4 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 function createSafeFragment( document ) {
        var list = nodeNames.split( "|" ),
        safeFrag = document.createDocumentFragment();
@@ -799,5 +797,3 @@ jQuery.extend({
                }
        }
 });
-
-})( jQuery );
index 362c1329b69e6e5f3c91541c14f6589f2d7cfd18..fcd39ed05f802d28e46dc9a06afd7d457a82b3d1 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 var rroot = /^(?:body|html)$/i;
 
 jQuery.fn.offset = function( options ) {
@@ -180,5 +178,3 @@ function getWindow( elem ) {
                        elem.defaultView || elem.parentWindow :
                        false;
 }
-
-})( jQuery );
\ No newline at end of file
index 17560378120511aab79a04743489fa08b4135d34..e47f721b81aeb42207b3b2da2384bc7a4d6d0340 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 jQuery.extend({
        queue: function( elem, type, data ) {
                var queue;
@@ -142,5 +140,3 @@ jQuery.fn.extend({
                return defer.promise( object );
        }
 });
-
-})( jQuery );
index 3a51ba74b303e6ffe5b98c0ffab4844583a763bb..16ce528f23073ad1a2474ca4d0405bee3f54996d 100644 (file)
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
 jQuery.support = (function() {
 
        var support,
@@ -268,5 +266,3 @@ jQuery.support = (function() {
 
        return support;
 })();
-
-})( jQuery );
index a5c08fba5ebdf974fd77077e29d74d832ebfdbca..3544f5be89981459bd99f6fc85f71bffd9e883a2 100644 (file)
@@ -1,11 +1,8 @@
-(function( jQuery ) {
-
 var runtil = /Until$/,
        rparentsprev = /^(?:parents|prevUntil|prevAll)/,
        // Note: This RegExp should be improved, or likely pulled from Sizzle
        rmultiselector = /,/,
        isSimple = /^.[^:#\[\.,]*$/,
-       slice = Array.prototype.slice,
        POS = jQuery.expr.match.globalPOS,
        // methods guaranteed to produce a unique set when starting from a unique set
        guaranteedUnique = {
@@ -299,5 +296,3 @@ function winnow( elements, qualifier, keep ) {
                return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
        });
 }
-
-})( jQuery );
index 3a029eb42fc6110841863b5da7d422df8c2bb1f5..9c90300bf71c6e57619fc8e1c1dafc34a83450b9 100644 (file)
@@ -5,7 +5,7 @@
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
        <title>CSP Test Page</title>
 
-       <script src="data/include_js.php"></script>
+       <script src="/dist/jquery.js"></script>
 </head>
 <body>
        <p>CSP Test Page</p>
index 8b434e719685742434b062841545e4a52bc0548c..ee9a709ae05297581c67a9741b5de4ef97942861 100644 (file)
@@ -11,7 +11,7 @@
 </head>
 <body>
        <div>
-               <script src="../include_js.php"></script>
+               <script src="/dist/jquery.js"></script>
        </div>
 </body>
-</html>
\ No newline at end of file
+</html>
index 2d2663328be6076d520eeb2ed0b837c7f3d58909..fe55d2125ffa949a732a9f98bd677ae6720b3fc9 100644 (file)
@@ -15,7 +15,7 @@
 </head>
 <body>
        <div>
-               <script src="../include_js.php"></script>
+               <script src="/dist/jquery.js"></script>
        </div>
 </body>
-</html>
\ No newline at end of file
+</html>
index 1d18efc173143d98b7aa71df45c6e4f83bfdd35e..f1f6aa20ffc47f666b3b318bf0cdfb716710c856 100644 (file)
@@ -19,7 +19,7 @@ if ( document.attachEvent ) {
                        });
                }
                document.getElementsByTagName("head")[ 0 ].appendChild( el );
-               el.src = "../include_js.php";
+               el.src = "/dist/jquery.js";
        }, 1000 );
 }
 </script>
index f799a7e3e9500da096d6a140ea61d4e3eb4592e1..04e45ae8d502a6c86b75be7faf4879e9daf4a48d 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <title>Test case for jQuery ticket #11470</title>
-<script type="text/javascript" src="../include_js.php"></script>
+<script type="text/javascript" src="/dist/jquery.js"></script>
 <script type="text/javascript">
 jQuery.when( jQuery.ready ).done(function() {
        jQuery("body").append("<div>modifying DOM</div>");
@@ -14,4 +14,4 @@ jQuery.when( jQuery.ready ).done(function() {
 <body>
 <!-- long loading iframe -->
 </body>
-</html>
\ No newline at end of file
+</html>
index 1b85ce0a8928b0897807620c2fca2e32f2134616..fcd2ac23a6bbbcee0b41eca75da2523bd5ad9aa5 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <title>Test case for jQuery ticket #10067</title>
-<script type="text/javascript" src="../include_js.php"></script>
+<script type="text/javascript" src="/dist/jquery.js"></script>
 </head>
 <body>
 <script type="text/javascript">
@@ -15,4 +15,4 @@ jQuery( document ).ready(function () {
 <!-- long loading iframe -->
 <iframe src="longLoad.php?sleep=10&return=false" style="width: 1px; height: 1px"></iframe>
 </body>
-</html>
\ No newline at end of file
+</html>
index 5a0e4afb4d65d2792820fd83244f192d0b783f3b..7d659a38266cf355b041bca400afd039233171ff 100644 (file)
@@ -15,7 +15,7 @@
                        p.instructions { position: absolute; bottom: 0; }
                        #positionTest { position: absolute; }
                </style>
-               <script src="../include_js.php"></script>
+               <script src="/dist/jquery.js"></script>
                <script type="text/javascript" charset="utf-8">
                        jQuery(function($) {
                                $('.absolute').click(function() {
index ec7668c10c895fbd6d93a10440b0fc73d2b949b1..5e955ea733fa9a61f9f9e75a8d566b731ee1cd5f 100644 (file)
@@ -8,7 +8,7 @@
                        body { margin: 1px; padding: 5px; }
                        #marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
                </style>
-               <script src="../include_js.php"></script>
+               <script src="/dist/jquery.js"></script>
                <script type="text/javascript" charset="utf-8">
                        jQuery(function($) {
                                $('body').click(function() {
index 8a7b31f196750862490a33284cf3a07b8ec0ca02..25e1010f444951483b2c40a381b6fef0264b2edd 100644 (file)
@@ -12,7 +12,7 @@
                        #forceScroll { width: 5000px; height: 5000px; }
                        #marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
                </style>
-               <script src="../include_js.php"></script>
+               <script src="/dist/jquery.js"></script>
                <script type="text/javascript" charset="utf-8">
                        jQuery(function($) {
                                window.scrollTo(1000,1000);
index 361d4b2940a26cf84c76d73f3796c72afef465c9..8a1203abf0549d05a61146edc4ea3866e70b09e7 100644 (file)
@@ -10,7 +10,7 @@
                        #relative-2 { top: 20px; left: 20px; }
                        #marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
                </style>
-               <script src="../include_js.php"></script>
+               <script src="/dist/jquery.js"></script>
                <script type="text/javascript" charset="utf-8">
                        jQuery(function($) {
                                $('.relative').click(function() {
index 17f01d8fc3d6e2e425774392b6bdc715c25d74b7..26cd6fcaf786edf472859cde752914ea538b8893 100644 (file)
@@ -13,7 +13,7 @@
                        #forceScroll { width: 5000px; height: 5000px; }
                        #marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
                </style>
-               <script src="../include_js.php"></script>
+               <script src="/dist/jquery.js"></script>
                <script type="text/javascript" charset="utf-8">
                        jQuery(function($) {
                                window.scrollTo(1000,1000);
index cb5ed03ebd5c17d319a5b2637725b8330ae42d81..64f1d7ec051f5ec6303063346354691141dae22a 100644 (file)
@@ -10,7 +10,7 @@
                        #static-2 { top: 20px; left: 20px; }
                        #marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
                </style>
-               <script src="../include_js.php"></script>
+               <script src="/dist/jquery.js"></script>
                <script type="text/javascript" charset="utf-8">
                        jQuery(function($) {
                                $('.static').click(function() {
index 4a6a7a470f20ffb277bff65b216eb63609266afe..f5bfbb69317aa009e4aeb5ceef8f8eff4bd3ba5a 100644 (file)
@@ -10,7 +10,7 @@
                        th, td { border: 1px solid #000; width: 100px; height: 100px; }
                        #marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
                </style>
-               <script src="../include_js.php"></script>
+               <script src="/dist/jquery.js"></script>
                <script type="text/javascript" charset="utf-8">
                        jQuery(function($) {
                                $('table, th, td').click(function() {
index ed0bfbc94a03e36fd9933d43c725a284c610073d..99c5bdbfeb84b3496bcf3a31771759244996cf56 100644 (file)
@@ -4,7 +4,7 @@
        <meta http-equiv="Content-type" content="text/html; charset=utf-8">
        <title>jQuery selector - attributes</title>
 
-       <script src="../include_js.php"></script>
+       <script src="/dist/jquery.js"></script>
 
        <script id="script1"
                        defer
index 6221263fa776ec2fde0c922acc261231b4e4dfb0..6260e2ab9e9b7aff89ae9c5d5c8f7479a28fa706 100644 (file)
@@ -4,11 +4,11 @@
        <meta http-equiv="Content-type" content="text/html; charset=utf-8">
        <title>jQuery selector - sizzle cache</title>
 
-       <script src="../include_js.php"></script>
+       <script src="/dist/jquery.js"></script>
        <script>
                var $cached = jQuery.noConflict(true);
        </script>
-       <script src="../include_js.php"></script>
+       <script src="/dist/jquery.js"></script>
 
 </head>
 <body>
index 4f0105a1d3a05b78859cac8d0a5002422dda6222..d1d118843cb2ac5db3c235a9196d4b867e175731 100644 (file)
@@ -17,7 +17,7 @@
 </head>
 <body>
        <div>
-               <script src="../include_js.php"></script>
+               <script src="/dist/jquery.js"></script>
        </div>
        <script>
                jQuery(function() {
index 6ef9651dacea52a5ae0ecc6dc752009e0f0de7b1..5ea5464b37145c7aaa888617485137ad580f2571 100644 (file)
@@ -7,7 +7,7 @@
                        background: url('http://s1.postimage.org/2d2r8xih0/body_background.png');
                }
        </style>
-       <script src="../include_js.php"></script>
+       <script src="/dist/jquery.js"></script>
 </head>
 <body>
        <script>
index b16771d3dd454a3c3fdb96a45a28fbf904dbcd5e..387005e41cb52efde5569681e0bd06cb126b9342 100644 (file)
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>Event Delegation Tests</title>
-<script src="data/include_js.php"></script>
+<script src="/dist/jquery.js"></script>
 <style>
 table {
        border-collapse: collapse;
@@ -122,7 +122,7 @@ th, td {
 </table>
 
        <form id="autosub"><input type=submit name=subme /></form>
-       
+
 <script type='text/javascript'>
 
 $("#fileversion").text($.fn.jquery);
@@ -168,7 +168,7 @@ for ( var i=0; i < events.length; i++ ) {
                api = m[0],
                type = m[1],
                $row = $("<tr><th>"+type+" "+api+"</th></tr>");
-       
+
        $("#changes thead td").each(function(){
                var id = "#"+this.id,
                        $cell = $('<td></td>');
index a0efd9f4f7db76ba7a1915f44cc8e4d4529e3192..5d5355d4cd9a6abdacf25beb5a13a1fb0dd54576 100644 (file)
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Hover tests</title>
-<script src="data/include_js.php"></script>
+<script src="/dist/jquery.js"></script>
 <style>
 /* Remove body dimensions so we can test enter/leave to surrounding browser chrome */
 body, html {
@@ -108,7 +108,7 @@ $(function(){
                };
 
        // Tests can be activated separately or in combination to check for interference
-               
+
        $("#hoverbox button").click(function(){
                $("#hoverbox")
                        .data({ ins: 0, outs: 0 })
index 62b633c78cb5ba2620f01afc323d27c00f3b0659..2457f11de4a59b997328f35834ed06ad0dd4a97d 100644 (file)
@@ -6,9 +6,9 @@
        <link rel="Stylesheet" media="screen" href="qunit/qunit/qunit.css" />
        <link rel="Stylesheet" media="screen" href="data/testsuite.css" />
        <!-- Includes -->
-       <script src="data/testinit.js"></script>
 
-       <script src="data/include_js.php"></script>
+       <script src="data/testinit.js"></script>
+       <script src="/dist/jquery.js"></script>
 
        <script src="qunit/qunit/qunit.js"></script>
        <script src="data/testrunner.js"></script>
index 2c089c4d2ae92ca678a7ae08b69fc3b1becd9dfe..2cfd130048109a25fb3d466479edeb355ca74ac3 100644 (file)
@@ -4,7 +4,7 @@
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
        <title>jQuery Local File Test</title>
        <!-- Includes -->
-       <script src="data/include_js.php"></script>
+       <script src="/dist/jquery.js"></script>
        <style>
                .error { color: red; }
                .success { color: green; }
@@ -72,4 +72,4 @@
                        this.addClass( "error" ).text( "FAIL" );
                });
        </script>
-</body>
\ No newline at end of file
+</body>
index e258d83d83768cedaed311cf22ad5c3d1248aad6..64b59f93d439aa9a643c1d73274d175cf92daf9e 100644 (file)
@@ -15,7 +15,7 @@
        <style>
                div { margin-top: 10px; }
        </style>
-       <script src="data/include_js.php"></script>
+       <script src="/dist/jquery.js"></script>
        <script type="text/javascript">
        $('button').live('click', function () {
                $.ajax({
@@ -81,4 +81,4 @@
                Test fails if the browser notifies an exception.
        </div>
 </body>
-</html>
\ No newline at end of file
+</html>
index a9eab39615a3bfe0e1bdf8ca267fc57738d4e36e..cd749a49d1ac3c0fd8130ee676405ff990e5051b 100644 (file)
@@ -14,7 +14,7 @@
                #output { background-color: green }
                #expectedOutput { background-color: green }
        </style>
-       <script src="data/include_js.php"></script>
+       <script src="/dist/jquery.js"></script>
 
        <!-- Load the script loader that uses
                jQuery.readyWait -->
@@ -37,7 +37,7 @@
                jQuery.holdReady Test
        </h1>
        <p>
-               This is a test page for jQuery.readyWait and jQuery.holdReady, 
+               This is a test page for jQuery.readyWait and jQuery.holdReady,
                see
                <a href="http://bugs.jquery.com/ticket/6781">#6781</a>
                and