jQuery.extend(true, Object, Object) copies objects with length keys correctly

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index 35e6e34..6f8d40f 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -130,10 +130,10 @@ jQuery.fn = jQuery.prototype = {
                return num == null ?
 
                        // Return a 'clean' array
-                       Array.prototype.slice.call( this ) :
+                       this.toArray() :
 
                        // Return just the object
-                       this[ num ];
+                       ( num < 0 ? this.toArray.call(this, num)[0] : this[ num ] );
        },
 
        // Take an array of elements and push it onto the stack
@@ -245,7 +245,7 @@ jQuery.extend = jQuery.fn.extend = function() {
                                if ( deep && copy && typeof copy === "object" && !copy.nodeType ) {
                                        target[ name ] = jQuery.extend( deep,
                                                // Never move original objects, clone them
-                                               src || ( copy.length != null ? [ ] : { } ), copy );
+                                               src || ( jQuery.isArray(copy) ? [ ] : { } ), copy );
 
                                // Don't bring in undefined values
                                } else if ( copy !== undefined ) {