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

jQuery.extend(true, Object, Object) copies objects with length keys correctly

Browse source
This commit is contained in:
Yehuda Katz 2009-07-16 07:31:55 +00:00
parent 6b912beb7b
commit 8d52c27808
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core.js
View file

@ -245,7 +245,7 @@ jQuery.extend = jQuery.fn.extend = function() {
if ( deep && copy && typeof copy === "object" && !copy.nodeType ) { if ( deep && copy && typeof copy === "object" && !copy.nodeType ) {
target[ name ] = jQuery.extend( deep, target[ name ] = jQuery.extend( deep,
// Never move original objects, clone them // Never move original objects, clone them
src || ( copy.length != null ? [ ] : { } ), copy ); src || ( jQuery.isArray(copy) ? [ ] : { } ), copy );
// Don't bring in undefined values // Don't bring in undefined values
} else if ( copy !== undefined ) { } else if ( copy !== undefined ) {

8
test/unit/core.js
View file

@ -435,7 +435,7 @@ test("jQuery.merge()", function() {
}); });
test("jQuery.extend(Object, Object)", function() { test("jQuery.extend(Object, Object)", function() {
expect(20); expect(21);
var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }, var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
options = { xnumber2: 1, xstring2: "x", xxx: "newstring" }, options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@ -460,6 +460,12 @@ test("jQuery.extend(Object, Object)", function() {
isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" ); isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );
equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" ); equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );
var empty = {};
var optionsWithLength = { foo: { length: -1 } };
jQuery.extend(true, empty, optionsWithLength);
isObj( empty.foo, optionsWithLength.foo, "The length property must copy correctly" );
var nullUndef; var nullUndef;
nullUndef = jQuery.extend({}, options, { xnumber2: null }); nullUndef = jQuery.extend({}, options, { xnumber2: null });
ok( nullUndef.xnumber2 === null, "Check to make sure null values are copied"); ok( nullUndef.xnumber2 === null, "Check to make sure null values are copied");