diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-07-16 07:32:03 +0000 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-07-16 07:32:03 +0000 |
commit | c10f87120f6fb2c6c269e766d6988e9be946dd03 (patch) | |
tree | bf957aeff0632f79411a946d83cd494c900b4a87 /src/core.js | |
parent | 8d52c27808a77f51d1cf42c7e738b0b356466c1a (diff) | |
download | jquery-c10f87120f6fb2c6c269e766d6988e9be946dd03.tar.gz jquery-c10f87120f6fb2c6c269e766d6988e9be946dd03.zip |
jQuery.extend(true, Object, Object) copies custom objects correctly.
- Also update jQuery.isObject to handle this case correctly
Diffstat (limited to 'src/core.js')
-rw-r--r-- | src/core.js | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/core.js b/src/core.js index 6f8d40ff4..b51886f48 100644 --- a/src/core.js +++ b/src/core.js @@ -243,9 +243,15 @@ jQuery.extend = jQuery.fn.extend = function() { // Recurse if we're merging object values if ( deep && copy && typeof copy === "object" && !copy.nodeType ) { - target[ name ] = jQuery.extend( deep, - // Never move original objects, clone them - src || ( jQuery.isArray(copy) ? [ ] : { } ), copy ); + var clone; + + if( src ) clone = src; + else if( jQuery.isArray(copy) ) clone = [ ]; + else if( jQuery.isObject(copy) ) clone = { }; + else clone = copy; + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); // Don't bring in undefined values } else if ( copy !== undefined ) { @@ -281,6 +287,10 @@ jQuery.extend({ return toString.call(obj) === "[object Array]"; }, + isObject: function( obj ) { + return this.constructor.call(obj) === Object; + }, + // check if an element is in a (or is an) XML document isXMLDoc: function( elem ) { return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" || |