Changeset 5385

Timestamp:

05/02/08 19:49:41 (7 months ago)

Author:

scott.gonzalez

Message:

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

Location:

trunk/jquery

Files:

• src/core.js (modified) (1 diff)
• test/unit/core.js (modified) (2 diffs)

trunk/jquery/src/core.js

@@ -588 +588 @@
 
                 // Don't bring in undefined values
-                else if ( copy != undefined )
+                else if ( copy !== undefined )
                     target[ name ] = copy;
 

trunk/jquery/test/unit/core.js

@@ -1026 +1026 @@
 
 test("$.extend(Object, Object)", function() {
-    expect(17);
+    expect(20);
 
     var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
@@ -1050 +1050 @@
     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" );
-
+    
+    var nullUndef;
+    nullUndef = jQuery.extend({}, options, { xnumber2: null });
+    ok( nullUndef.xnumber2 === null, "Check to make sure null values are copied");
+    
+    nullUndef = jQuery.extend({}, options, { xnumber2: undefined });
+    ok( nullUndef.xnumber2 === options.xnumber2, "Check to make sure undefined values are not copied");
+    
+    nullUndef = jQuery.extend({}, options, { xnumber0: null });
+    ok( nullUndef.xnumber0 === null, "Check to make sure null values are inserted");
+    
     var target = {};
     var recursive = { foo:target, bar:5 };