core: Fixed #2600: jQuery.extend no longer skips over null properties.

diff --git a/src/core.js b/src/core.js
index 80115b44278daab14aa8be5e141eee4f3a450dbd..c3cd3d8e3ccf93a3a3a926cf0bda597280287f3e 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -587,7 +587,7 @@ jQuery.extend = jQuery.fn.extend = function() {
                                        target[ name ] = jQuery.extend( deep, src, copy );
 
                                // Don't bring in undefined values
-                               else if ( copy != undefined )
+                               else if ( copy !== undefined )
                                        target[ name ] = copy;
 
                        }

diff --git a/test/unit/core.js b/test/unit/core.js
index 053803cd41f5a04daef38e2ecec4444b28c2dfbf..7ec825832106cedb2cc631c30a8a15e7feaa78a5 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1025,7 +1025,7 @@ test("is(String)", function() {
 });\r
 \r
 test("$.extend(Object, Object)", function() {\r
-       expect(17);\r
+       expect(20);\r
 \r
        var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },\r
                options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },\r
@@ -1049,7 +1049,17 @@ test("$.extend(Object, Object)", function() {
        isObj( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" );\r
        isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );\r
        equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );\r
-\r
+       \r
+       var nullUndef;\r
+       nullUndef = jQuery.extend({}, options, { xnumber2: null });\r
+       ok( nullUndef.xnumber2 === null, "Check to make sure null values are copied");\r
+       \r
+       nullUndef = jQuery.extend({}, options, { xnumber2: undefined });\r
+       ok( nullUndef.xnumber2 === options.xnumber2, "Check to make sure undefined values are not copied");\r
+       \r
+       nullUndef = jQuery.extend({}, options, { xnumber0: null });\r
+       ok( nullUndef.xnumber0 === null, "Check to make sure null values are inserted");\r
+       \r
        var target = {};\r
        var recursive = { foo:target, bar:5 };\r
        jQuery.extend(true, target, recursive);\r