deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Made jQuery.extend(true, ...) to extend recursively only 'object literal' values.

Browse source
This commit is contained in:
Robert Katic 2009-11-12 13:48:45 +08:00 committed by John Resig
parent 990d9ca1b0
commit 93be758de9
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/core.js
View file

@ -272,19 +272,10 @@ jQuery.extend = jQuery.fn.extend = function() {
continue; continue;
} }
// Recurse if we're merging object values // Recurse if we're merging object literal values
if ( deep && copy && typeof copy === "object" && !copy.nodeType ) { if ( deep && copy && jQuery.isObjectLiteral(copy) ) {
var clone; // Don't extend not object literals
var clone = src && jQuery.isObjectLiteral(src) ? src : {};
if ( src ) {
clone = src;
} else if ( jQuery.isArray(copy) ) {
clone = [];
} else if ( jQuery.isObjectLiteral(copy) ) {
clone = {};
} else {
clone = copy;
}
// Never move original objects, clone them // Never move original objects, clone them
target[ name ] = jQuery.extend( deep, clone, copy ); target[ name ] = jQuery.extend( deep, clone, copy );

10
test/unit/core.js
View file

@ -553,16 +553,20 @@ test("jQuery.extend(Object, Object)", function() {
same( empty.foo, optionsWithDate.foo, "Dates copy correctly" ); same( empty.foo, optionsWithDate.foo, "Dates copy correctly" );
var myKlass = function() {}; var myKlass = function() {};
var optionsWithCustomObject = { foo: { date: new myKlass } }; var customObject = new myKlass();
var optionsWithCustomObject = { foo: { date: new customObject } };
empty = {}; empty = {};
jQuery.extend(true, empty, optionsWithCustomObject); jQuery.extend(true, empty, optionsWithCustomObject);
same( empty.foo, optionsWithCustomObject.foo, "Custom objects copy correctly (no methods)" ); ok( empty.foo && empty.foo.date && empty.foo.date === customObject, "Custom objects copy correctly (no methods)" );
// Makes the class a little more realistic // Makes the class a little more realistic
myKlass.prototype = { someMethod: function(){} }; myKlass.prototype = { someMethod: function(){} };
empty = {}; empty = {};
jQuery.extend(true, empty, optionsWithCustomObject); jQuery.extend(true, empty, optionsWithCustomObject);
same( empty.foo, optionsWithCustomObject.foo, "Custom objects copy correctly" ); ok( empty.foo && empty.foo.date && empty.foo.date === customObject, "Custom objects copy correctly" );
var ret = jQuery.extend(true, { foo: 4 }, { foo: new Number(5) } );
ok( ret.foo == 5, "Wrapped numbers copy correctly" );
var nullUndef; var nullUndef;
nullUndef = jQuery.extend({}, options, { xnumber2: null }); nullUndef = jQuery.extend({}, options, { xnumber2: null });