aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Resig <jeresig@gmail.com>2009-05-20 21:12:08 +0000
committerJohn Resig <jeresig@gmail.com>2009-05-20 21:12:08 +0000
commita0451f162e95b552f9dc307b8529c114edeab417 (patch)
tree029ca9509d8827bfa427045e1ae2dd61c0cd1a90 /src
parentb97b886fcd212b7a4c8c883b1afb04b6bd071545 (diff)
downloadjquery-a0451f162e95b552f9dc307b8529c114edeab417.tar.gz
jquery-a0451f162e95b552f9dc307b8529c114edeab417.zip
Did some light reordering of the jQuery definition. Moved window and undefined to exist in intro/outro.
Diffstat (limited to 'src')
-rw-r--r--src/core.js25
-rw-r--r--src/intro.js2
-rw-r--r--src/outro.js2
3 files changed, 12 insertions, 17 deletions
diff --git a/src/core.js b/src/core.js
index 23b4a57dd..9d0d41f8b 100644
--- a/src/core.js
+++ b/src/core.js
@@ -1,8 +1,10 @@
-// Will speed up references to window, and allows munging its name.
-var window = this,
-
- // Will speed up references to undefined, and allows munging its name.
- undefined,
+// Define a local copy of jQuery
+var jQuery = function( selector, context ) {
+ // The jQuery object is actually just the init constructor 'enhanced'
+ return arguments.length === 0 ?
+ rootjQuery :
+ new jQuery.fn.init( selector, context );
+ },
// Map over jQuery in case of overwrite
_jQuery = window.jQuery,
@@ -10,19 +12,9 @@ var window = this,
// Map over the $ in case of overwrite
_$ = window.$,
- // Define a local copy of jQuery
- jQuery,
-
// A central reference to the root jQuery(document)
rootjQuery,
- jQuery = window.jQuery = window.$ = function( selector, context ) {
- // The jQuery object is actually just the init constructor 'enhanced'
- return arguments.length === 0 ?
- rootjQuery :
- new jQuery.fn.init( selector, context );
- },
-
// A simple way to check for HTML strings or ID strings
// (both of which we optimize for)
quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,
@@ -36,6 +28,9 @@ var window = this,
// Save a reference to the core toString method
toString = Object.prototype.toString;
+// Expose jQuery to the global object
+window.jQuery = window.$ = jQuery;
+
jQuery.fn = jQuery.prototype = {
init: function( selector, context ) {
var match, elem, ret;
diff --git a/src/intro.js b/src/intro.js
index 893df9254..3b9dd8e22 100644
--- a/src/intro.js
+++ b/src/intro.js
@@ -9,5 +9,5 @@
* Date:
* Revision:
*/
-(function(){
+(function(window, undefined){
diff --git a/src/outro.js b/src/outro.js
index 0319a0fe5..7773a74fd 100644
--- a/src/outro.js
+++ b/src/outro.js
@@ -1 +1 @@
-})();
+})(window);