diff options
author | John Resig <jeresig@gmail.com> | 2009-12-06 17:11:51 -0500 |
---|---|---|
committer | John Resig <jeresig@gmail.com> | 2009-12-06 17:11:51 -0500 |
commit | 87ba780c69ac1af04afc40f2da39282d917f9108 (patch) | |
tree | b0da65b171a1c018597c180382b3aa5767fdf3a4 /src/core.js | |
parent | 3c89e38fc26ef40797b83ba8ef4f8329b08afe75 (diff) | |
download | jquery-87ba780c69ac1af04afc40f2da39282d917f9108.tar.gz jquery-87ba780c69ac1af04afc40f2da39282d917f9108.zip |
Renamed isObjectLiteral to isPlainObject (makes more sense, per the suggestion of Michael Geary).
Diffstat (limited to 'src/core.js')
-rw-r--r-- | src/core.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core.js b/src/core.js index 4949d6bf4..4091111a9 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; } |