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

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

View file

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