Skip to content

/jquery

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Strips IIFEs from modules; Always require built jQuery for tests.

  • Loading branch information...
commit 7c23b77af2477417205fda9bde5208a81e57e40e 1 parent 9a3046c
Rick Waldron rwaldron authored
Unified Split
Showing with 209 additions and 322 deletions.
  1. +1 −0  .gitignore
  2. +6 −118 Makefile
  3. +48 −25 README.md
  4. +58 −9 grunt.js
  5. +0 −4 src/ajax.js
  6. +0 −4 src/ajax/jsonp.js
  7. +0 −4 src/ajax/script.js
  8. +0 −4 src/ajax/xhr.js
  9. +0 −4 src/attributes.js
  10. +0 −4 src/callbacks.js
  11. +14 −15 src/core.js
  12. +45 −48 src/css.js
  13. +0 −4 src/data.js
  14. +1 −5 src/deferred.js
  15. +0 −4 src/dimensions.js
  16. +1 −1  src/effects.js
  17. +0 −4 src/event.js
  18. +0 −4 src/exports.js
  19. +0 −5 src/intro.js
  20. +0 −4 src/manipulation.js
  21. +0 −4 src/offset.js
  22. +0 −4 src/queue.js
  23. +0 −4 src/support.js
  24. +0 −5 src/traversing.js
  25. +1 −1  test/csp.php
  26. +2 −2 test/data/dimensions/documentLarge.html
  27. +2 −2 test/data/dimensions/documentSmall.html
  28. +1 −1  test/data/event/asyncReady.html
  29. +2 −2 test/data/event/promiseReady.html
  30. +2 −2 test/data/event/syncReady.html
  31. +1 −1  test/data/offset/absolute.html
  32. +1 −1  test/data/offset/body.html
  33. +1 −1  test/data/offset/fixed.html
  34. +1 −1  test/data/offset/relative.html
  35. +1 −1  test/data/offset/scroll.html
  36. +1 −1  test/data/offset/static.html
  37. +1 −1  test/data/offset/table.html
  38. +1 −1  test/data/selector/html5_selector.html
  39. +2 −2 test/data/selector/sizzle_cache.html
  40. +1 −1  test/data/support/bodyBackground.html
  41. +1 −1  test/data/support/testElementCrash.html
  42. +3 −3 test/delegatetest.html
  43. +2 −2 test/hovertest.html
  44. +2 −2 test/index.html
  45. +2 −2 test/localfile.html
  46. +2 −2 test/networkerror.html
  47. +2 −2 test/readywait.html
1  .gitignore
View
@@ -7,5 +7,6 @@ dist
*.patch
/*.html
.DS_Store
+dist/.sizecache.json
build/.sizecache.json
node_modules
124 Makefile
View
@@ -1,122 +1,13 @@
-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
73 README.md
View
@@ -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:
Timo Tijhof
Krinkle added a note

rmndr:littletypo

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+
+`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/`
Timo Tijhof
Krinkle added a note
  • ./Dropbox/Public/ is the public directory of the user's Dropbox (if he has that application installed on his Mac).
  • ./Public/Drop Box/ is a directory that other users on the computer can drop files into (and exists by default in any Mac account)

I'm not sure if either make sense here.

Rick Waldron Collaborator
rwaldron added a note

How is any of this relevant? It was just arbitrary example that made up...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+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
---------------
67 grunt.js
View
@@ -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." );
+ });
+ }
+ });
};
4 src/ajax.js
View
@@ -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 );
4 src/ajax/jsonp.js
View
@@ -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 );
4 src/ajax/script.js
View
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
// Install script dataType
jQuery.ajaxSetup({
accepts: {
@@ -85,5 +83,3 @@ jQuery.ajaxTransport( "script", function(s) {
};
}
});
-
-})( jQuery );
4 src/ajax/xhr.js
View
@@ -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 );
4 src/attributes.js
View
@@ -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 );
4 src/callbacks.js
View
@@ -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 );
29 src/core.js
View
@@ -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;
-
-})();
93 src/css.js
View
@@ -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 );
4 src/data.js
View
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
var rbrace = /^(?:\{.*\}|\[.*\])$/,
rmultiDash = /([A-Z])/g;
@@ -368,5 +366,3 @@ function isEmptyDataObject( obj ) {
return true;
}
-
-})( jQuery );
6 src/deferred.js
View
@@ -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 );
4 src/dimensions.js
View
@@ -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 );
2  src/effects.js
View
@@ -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 {
4 src/event.js
View
@@ -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 );
4 src/exports.js
View
@@ -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 );
5 src/intro.js
View
@@ -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;
4 src/manipulation.js
View
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
function createSafeFragment( document ) {
var list = nodeNames.split( "|" ),
safeFrag = document.createDocumentFragment();
@@ -799,5 +797,3 @@ jQuery.extend({
}
}
});
-
-})( jQuery );
4 src/offset.js
View
@@ -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 );
4 src/queue.js
View
@@ -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 );
4 src/support.js
View
@@ -1,5 +1,3 @@
-(function( jQuery ) {
-
jQuery.support = (function() {
var support,
@@ -268,5 +266,3 @@ jQuery.support = (function() {
return support;
})();
-
-})( jQuery );
5 src/traversing.js
View
@@ -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 );
2  test/csp.php
View
@@ -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>
4 test/data/dimensions/documentLarge.html
View
@@ -11,7 +11,7 @@
</head>
<body>
<div>
- <script src="../include_js.php"></script>
+ <script src="/dist/jquery.js"></script>
</div>
</body>
-</html>
+</html>
4 test/data/dimensions/documentSmall.html
View
@@ -15,7 +15,7 @@
</head>
<body>
<div>
- <script src="../include_js.php"></script>
+ <script src="/dist/jquery.js"></script>
</div>
</body>
-</html>
+</html>
2  test/data/event/asyncReady.html
View
@@ -19,7 +19,7 @@
});
}
document.getElementsByTagName("head")[ 0 ].appendChild( el );
- el.src = "../include_js.php";
+ el.src = "/dist/jquery.js";
}, 1000 );
}
</script>
4 test/data/event/promiseReady.html
View
@@ -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 @@
<body>
<!-- long loading iframe -->
</body>
-</html>
+</html>
4 test/data/event/syncReady.html
View
@@ -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 @@
<!-- long loading iframe -->
<iframe src="longLoad.php?sleep=10&return=false" style="width: 1px; height: 1px"></iframe>
</body>
-</html>
+</html>
2  test/data/offset/absolute.html
View
@@ -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() {
2  test/data/offset/body.html
View
@@ -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() {
2  test/data/offset/fixed.html
View
@@ -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);
2  test/data/offset/relative.html
View
@@ -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() {
2  test/data/offset/scroll.html
View
@@ -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);
2  test/data/offset/static.html
View
@@ -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() {
2  test/data/offset/table.html
View
@@ -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() {
2  test/data/selector/html5_selector.html
View
@@ -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
4 test/data/selector/sizzle_cache.html
View
@@ -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>
2  test/data/support/bodyBackground.html
View
@@ -17,7 +17,7 @@
</head>
<body>
<div>
- <script src="../include_js.php"></script>
+ <script src="/dist/jquery.js"></script>
</div>
<script>
jQuery(function() {
2  test/data/support/testElementCrash.html
View
@@ -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>
6 test/delegatetest.html
View
@@ -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 @@
</table>
<form id="autosub"><input type=submit name=subme /></form>
-
+
<script type='text/javascript'>
$("#fileversion").text($.fn.jquery);
@@ -168,7 +168,7 @@
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>');
4 test/hovertest.html
View
@@ -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 @@
};
// Tests can be activated separately or in combination to check for interference
-
+
$("#hoverbox button").click(function(){
$("#hoverbox")
.data({ ins: 0, outs: 0 })
4 test/index.html
View
@@ -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>
4 test/localfile.html
View
@@ -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>
+</body>
4 test/networkerror.html
View
@@ -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>
+</html>
4 test/readywait.html
View
@@ -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
Timo Tijhof
Krinkle commented on README.md in 7c23b77
  • ./Dropbox/Public/ is the public directory of the user's Dropbox (if he has that application installed on his Mac).
  • ./Public/Drop Box/ is a directory that other users on the computer can drop files into (and exists by default in any Mac account)

I'm not sure if either make sense here.

Timo Tijhof
Krinkle commented on README.md in 7c23b77

rmndr:littletypo

Rick Waldron
Collaborator
rwaldron commented on README.md in 7c23b77

How is any of this relevant? It was just arbitrary example that made up...

Please sign in to comment.
Something went wrong with that request. Please try again.