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

Fixed #1908 by testing to make sure it isn't null before checking the nodeType.

Browse source
This commit is contained in:
David Serduke 2007-11-28 23:42:16 +00:00
parent ed7608d8ee
commit 95c0265486
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core.js
View file

@ -549,11 +549,11 @@ jQuery.extend = jQuery.fn.extend = function() {
continue; continue;
// Recurse if we're merging object values // Recurse if we're merging object values
if ( deep && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType ) if ( deep && options[ name ] && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType )
target[ name ] = jQuery.extend( target[ name ], options[ name ] ); target[ name ] = jQuery.extend( target[ name ], options[ name ] );
// Don't bring in undefined values // Don't bring in undefined values
else if ( options[ name ] != undefined ) else if ( options[ name ] !== undefined )
target[ name ] = options[ name ]; target[ name ] = options[ name ];
} }

5
test/unit/core.js
View file

@ -837,7 +837,7 @@ test("is(String)", function() {
}); });
test("$.extend(Object, Object)", function() { test("$.extend(Object, Object)", function() {
expect(14); expect(15);
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" },
@ -873,6 +873,9 @@ test("$.extend(Object, Object)", function() {
var ret = jQuery.extend(true, { foo: "1,2,3" }, { foo: [1, 2, 3] } ); var ret = jQuery.extend(true, { foo: "1,2,3" }, { foo: [1, 2, 3] } );
ok( typeof ret.foo != "string", "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" ); ok( typeof ret.foo != "string", "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" );
var ret = jQuery.extend(true, { foo:"bar" }, { foo:null } );
equals( ret.foo, null, "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" );
var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }, var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }, defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
options1 = { xnumber2: 1, xstring2: "x" }, options1 = { xnumber2: 1, xstring2: "x" },