Changeset 4611 for trunk/jquery

Timestamp:

02/03/08 18:43:04 (1 year ago)

Author:

jeresig

Message:

You can now overwrite values returned from .data() with .bind("getData") - returning a value will override any bound value on that element.

Location:

trunk/jquery

Files:

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

trunk/jquery/src/core.js

@@ -481 +481 @@
     data: function( key, value ){
         var parts = key.split(".");
+        parts[1] = parts[1] ? "." + parts[1] : "";
 
         if ( value == null ) {
-            if ( this.length ) {
-                var data = jQuery.data( this[0], key );
-                return data == null ?
-                    jQuery.data( this[0], parts[0] ) :
-                    data;
-            }
+            var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+            
+            if ( data == undefined && this.length )
+                data = jQuery.data( this[0], key );
+
+            return data == null && parts[1] ?
+                this.data( parts[0] ) :
+                data;
         } else
-            return this.trigger("setData" + (parts[1] ? "." + parts[1] : "") + "!", [parts[0], value]).each(function(){
+            return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
                 jQuery.data( this, key, value );
             });

trunk/jquery/test/unit/core.js

@@ -1399 +1399 @@
 
 test(".data()", function() {
-    expect(11);
+    expect(16);
     var div = $("#foo");
     ok( div.data("test") == undefined, "Check for no data exists" );
@@ -1407 +1407 @@
     ok( div.data("test") == "overwritten", "Check for overwritten data" );
 
-    var hits = {test:0};
+    var hits = {test:0}, gets = {test:0};
 
     div
         .bind("setData",function(e,key,value){ hits[key] += value; })
         .bind("setData.foo",function(e,key,value){ hits[key] += value; })
+        .bind("getData",function(e,key){ gets[key] += 1; })
+        .bind("getData.foo",function(e,key){ gets[key] += 3; });
 
     div.data("test.foo", 2);
@@ -1417 +1419 @@
     ok( div.data("test.foo") == 2, "Check for namespaced data" );
     ok( div.data("test.bar") == "overwritten", "Check for unmatched namespace" );
-    ok( hits.test == 2, "Check triggered functions" );
+    equals( hits.test, 2, "Check triggered setter functions" );
+    equals( gets.test, 5, "Check triggered getter functions" );
 
     hits.test = 0;
+    gets.test = 0;
 
     div.data("test", 1);
@@ -1425 +1429 @@
     ok( div.data("test.foo") == 2, "Check for namespaced data" );
     ok( div.data("test.bar") == 1, "Check for unmatched namespace" );
-    ok( hits.test == 1, "Check triggered functions" );
+    equals( hits.test, 1, "Check triggered setter functions" );
+    equals( gets.test, 5, "Check triggered getter functions" );
+
+    hits.test = 0;
+    gets.test = 0;
+
+    div
+        .bind("getData",function(e,key){ return key + "root"; })
+        .bind("getData.foo",function(e,key){ return key + "foo"; });
+
+    ok( div.data("test") == "testroot", "Check for original data" );
+    ok( div.data("test.foo") == "testfoo", "Check for namespaced data" );
+    ok( div.data("test.bar") == "testroot", "Check for unmatched namespace" );
 });