X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=4091111a944aa0bfffab3d5ea920bd8ea22a2b5e;hb=ebad701751689b773afe29d1e3c4532c7810d02a;hp=4949d6bf4e2a9de52eb0ca2683125e9be9433861;hpb=2b481b93cfca62f95aa7005e7db651456fa08e65;p=jquery.git diff --git a/src/core.js b/src/core.js index 4949d6b..4091111 100644 --- a/src/core.js +++ b/src/core.js @@ -273,9 +273,9 @@ jQuery.extend = jQuery.fn.extend = function() { } // Recurse if we're merging object literal values - if ( deep && copy && jQuery.isObjectLiteral(copy) ) { + if ( deep && copy && jQuery.isPlainObject(copy) ) { // Don't extend not object literals - var clone = src && jQuery.isObjectLiteral(src) ? src : {}; + var clone = src && jQuery.isPlainObject(src) ? src : {}; // Never move original objects, clone them target[ name ] = jQuery.extend( deep, clone, copy ); @@ -314,7 +314,7 @@ jQuery.extend({ return toString.call(obj) === "[object Array]"; }, - isObjectLiteral: function( obj ) { + isPlainObject: function( obj ) { if ( toString.call(obj) !== "[object Object]" || typeof obj.nodeType === "number" ) { return false; }