Scope 'document' locally (also useful for sandboxing). Patch from Andrea Giammarchi...

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index 23b4a57..ee4ac70 100644 (file)
--- 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,12 @@ var window = this,
        // Map over the $ in case of overwrite
        _$ = window.$,
 
-       // Define a local copy of jQuery
-       jQuery,
+       // Use the correct document accordingly with window argument (sandbox)
+       document = window.document,
 
        // 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 +31,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;
@@ -77,10 +75,13 @@ jQuery.fn = jQuery.prototype = {
                                        }
 
                                        // Otherwise, we inject the element directly into the jQuery object
-                                       ret = jQuery( elem || null );
-                                       ret.context = document;
-                                       ret.selector = selector;
-                                       return ret;
+                                       this.length = elem ? 1 : 0;
+                                       if ( elem ) {
+                                               this[0] = elem;
+                                       }
+                                       this.context = document;
+                                       this.selector = selector;
+                                       return this;
                                }
 
                        // HANDLE: $(expr, $(...))
@@ -312,10 +313,12 @@ jQuery.extend({
 
        // args is for internal usage only
        each: function( object, callback, args ) {
-               var name, i = 0, length = object.length;
+               var name, i = 0, 
+                       length = object.length,
+                       isObj = length === undefined || jQuery.isFunction(object);
 
                if ( args ) {
-                       if ( length === undefined ) {
+                       if ( isObj ) {
                                for ( name in object ) {
                                        if ( callback.apply( object[ name ], args ) === false ) {
                                                break;
@@ -331,7 +334,7 @@ jQuery.extend({
 
                // A special, fast, case for the most common use of each
                } else {
-                       if ( length === undefined ) {
+                       if ( isObj ) {
                                for ( name in object ) {
                                        if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
                                                break;