Changeset 5358

Timestamp:

04/30/08 00:09:55 (4 months ago)

Author:

aflesler

Message:

jquery core: extend() now supports deep + extending jquery itself
cached some vars and it proved to be faster.

Files:

• trunk/jquery/src/core.js (modified) (2 diffs)

trunk/jquery/src/core.js

@@ -567 +567 @@
 
     // extend jQuery itself if only one argument is passed
-    if ( length == 1 ) {
+    if ( length == i ) {
         target = this;
-        i = 0;
+        --i;
     }
 
@@ -577 +577 @@
             // Extend the base object
             for ( var name in options ) {
+                var src = target[ name ], copy = options[ name ]; 
+                
                 // Prevent never-ending loop
-                if ( target === options[ name ] )
+                if ( target === copy )
                     continue;
 
                 // Recurse if we're merging object values
-                if ( deep && options[ name ] && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType )
-                    target[ name ] = jQuery.extend( deep, target[ name ], options[ name ] );
+                if ( deep && copy && typeof copy == "object" && src && !copy.nodeType )
+                    target[ name ] = jQuery.extend( deep, src, copy );
 
                 // Don't bring in undefined values
-                else if ( options[ name ] != undefined )
-                    target[ name ] = options[ name ];
+                else if ( copy != undefined )
+                    target[ name ] = copy;
 
             }