From a0451f162e95b552f9dc307b8529c114edeab417 Mon Sep 17 00:00:00 2001 From: John Resig Date: Wed, 20 May 2009 21:12:08 +0000 Subject: [PATCH] Did some light reordering of the jQuery definition. Moved window and undefined to exist in intro/outro. --- src/core.js | 25 ++++++++++--------------- src/intro.js | 2 +- src/outro.js | 2 +- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/core.js b/src/core.js index 23b4a57..9d0d41f 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 893df92..3b9dd8e 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 0319a0f..7773a74 100644 --- a/src/outro.js +++ b/src/outro.js @@ -1 +1 @@ -})(); +})(window); -- 1.7.10.4