Made jQuery.extend(true, ...) to extend recursively only 'object literal' values.

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index 611e536..b821336 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -272,19 +272,10 @@ jQuery.extend = jQuery.fn.extend = function() {
                                        continue;
                                }
 
-                               // Recurse if we're merging object values
-                               if ( deep && copy && typeof copy === "object" && !copy.nodeType ) {
-                                       var clone;
-
-                                       if ( src ) {
-                                               clone = src;
-                                       } else if ( jQuery.isArray(copy) ) {
-                                               clone = [];
-                                       } else if ( jQuery.isObjectLiteral(copy) ) {
-                                               clone = {};
-                                       } else {
-                                               clone = copy;
-                                       }
+                               // Recurse if we're merging object literal values
+                               if ( deep && copy && jQuery.isObjectLiteral(copy) ) {
+                                       // Don't extend not object literals
+                                       var clone = src && jQuery.isObjectLiteral(src) ? src : {};
 
                                        // Never move original objects, clone them
                                        target[ name ] = jQuery.extend( deep, clone, copy );
@@ -328,13 +319,20 @@ jQuery.extend({
                        return false;
                }
                
+               // not own constructor property must be Object
+               if ( obj.constructor
+                 && !hasOwnProperty.call(obj, "constructor")
+                 && !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
+                       return false;
+               }
+               
                //own properties are iterated firstly,
                //so to speed up, we can test last one if it is own or not
-               
+       
                var key;
                for ( key in obj ) {}
                
-               return !key || hasOwnProperty.call( obj, key );
+               return key === undefined || hasOwnProperty.call( obj, key );
        },
 
        isEmptyObject: function( obj ) {