github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-07 03:55:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Renamed isObjectLiteral to isPlainObject (makes more sense, per the suggestion of Michael Geary).

Browse Source
This commit is contained in:
John Resig
2009-12-06 17:11:51 -05:00
parent 3c89e38fc2
commit 87ba780c69
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core.js
View File

@@ -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;
}