Skip to content
Permalink
Browse files

Made jQuery.extend(true, ...) to extend recursively only 'object lite…

…ral' values.
  • Loading branch information
rkatic authored and jeresig committed Nov 12, 2009
1 parent 990d9ca commit 93be758de94b2d4a76fca217465c9e09b613cedd
Showing with 11 additions and 16 deletions.
  1. +4 −13 src/core.js
  2. +7 −3 test/unit/core.js
@@ -272,19 +272,10 @@ jQuery.extend = jQuery.fn.extend = function() {
continue;
}

// Recurse if we're merging object values
if ( deep && copy && typeof copy === "object" && !copy.nodeType ) {
var clone;

if ( src ) {
clone = src;
} else if ( jQuery.isArray(copy) ) {
clone = [];
} else if ( jQuery.isObjectLiteral(copy) ) {
clone = {};
} else {
clone = copy;
}
// Recurse if we're merging object literal values
if ( deep && copy && jQuery.isObjectLiteral(copy) ) {
// Don't extend not object literals
var clone = src && jQuery.isObjectLiteral(src) ? src : {};

// Never move original objects, clone them
target[ name ] = jQuery.extend( deep, clone, copy );
@@ -553,16 +553,20 @@ test("jQuery.extend(Object, Object)", function() {
same( empty.foo, optionsWithDate.foo, "Dates copy correctly" );

var myKlass = function() {};
var optionsWithCustomObject = { foo: { date: new myKlass } };
var customObject = new myKlass();
var optionsWithCustomObject = { foo: { date: new customObject } };
empty = {};
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
myKlass.prototype = { someMethod: function(){} };
empty = {};
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;
nullUndef = jQuery.extend({}, options, { xnumber2: null });

0 comments on commit 93be758

Please sign in to comment.
You can’t perform that action at this time.