From: David Serduke <davidserduke@gmail.com>
Date: Wed, 28 Nov 2007 23:42:16 +0000 (+0000)
Subject: Fixed #1908 by testing to make sure it isn't null before checking the nodeType.
X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=95c0265486fc551a08ec20d6060a3a382aa8a76b;p=jquery.git

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

diff --git a/src/core.js b/src/core.js
index 39aa65b..4c12150 100644
--- a/src/core.js
+++ b/src/core.js
@@ -549,11 +549,11 @@ jQuery.extend = jQuery.fn.extend = function() {
 					continue;
 
 				// 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 ] );
 
 				// Don't bring in undefined values
-				else if ( options[ name ] != undefined )
+				else if ( options[ name ] !== undefined )
 					target[ name ] = options[ name ];
 
 			}
diff --git a/test/unit/core.js b/test/unit/core.js
index f77d1f8..f039304 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -837,7 +837,7 @@ test("is(String)", function() {
 });
 
 test("$.extend(Object, Object)", function() {
-	expect(14);
+	expect(15);
 
 	var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		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] } );
 	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" },
 		defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		options1 =     { xnumber2: 1, xstring2: "x" },