jQuery.extend(true, Object, Object) copies custom objects correctly.
- Also update jQuery.isObject to handle this case correctly
This commit is contained in:
parent
8d52c27808
commit
c10f87120f
2 changed files with 25 additions and 5 deletions
16
src/core.js
16
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" ||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue