Changeset 5390

Timestamp:

05/03/08 01:51:55 (8 months ago)

Author:

scott.gonzalez

Message:

core: Fixed #2605: .data() now accepts null as a value.

Location:

trunk/jquery

Files:

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

trunk/jquery/src/core.js

@@ -466 +466 @@
         parts[1] = parts[1] ? "." + parts[1] : "";
 
-        if ( value == null ) {
+        if ( value === undefined ) {
             var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
             
-            if ( data == undefined && this.length )
+            if ( data === undefined && this.length )
                 data = jQuery.data( this[0], key );
 
-            return data == null && parts[1] ?
+            return data === undefined && parts[1] ?
                 this.data( parts[0] ) :
                 data;

trunk/jquery/test/unit/core.js

@@ -1413 +1413 @@
 
 test(".data()", function() {
-    expect(16);
+    expect(18);
     var div = $("#foo");
     ok( div.data("test") == undefined, "Check for no data exists" );
@@ -1420 +1420 @@
     div.data("test", "overwritten");
     ok( div.data("test") == "overwritten", "Check for overwritten data" );
-
+    div.data("test", undefined);
+    ok( div.data("test") == "overwritten", "Check that data wasn't removed");
+    div.data("test", null);
+    ok( div.data("test") === null, "Check for null data");
+    
+    div.data("test", "overwritten");
     var hits = {test:0}, gets = {test:0};
-
+    
     div
         .bind("setData",function(e,key,value){ hits[key] += value; })