Changeset 4600

Timestamp:

02/03/08 04:05:24 (10 months ago)

Author:

jeresig

Message:

Added $().data(), $().removeData(), and .bind("click!"). .data() and .removeData() handle namespaced data, .data() triggers a "set-KEY" event on all modified elements, and .bind("click!") only triggers a click (and no namespaced events).

Location:

trunk/jquery

Files:

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

trunk/jquery/src/core.js

@@ -477 +477 @@
     andSelf: function() {
         return this.add( this.prevObject );
+    },
+
+    data: function( key, value ){
+        if ( value == null ) {
+            if ( this.length ) {
+                var data = jQuery.data( this[0], key );
+                return data == null ?
+                    jQuery.data( this[0], key.split(".")[0] ) :
+                    data;
+            }
+        } else
+            return this.trigger("set-" + key + "!", [value]).each(function(){
+                jQuery.data( this, key, value );
+            });
+    },
+
+    removeData: function( key ){
+        return this.each(function(){
+            jQuery.removeData( this, key );
+        });
     },
     

trunk/jquery/src/event.js

@@ -170 +170 @@
         data = jQuery.makeArray(data || []);
 
+        if ( type.indexOf("!") >= 0 ) {
+            type = type.slice(0, -1);
+            var exclusive = true;
+        }
+
         // Handle a global trigger
         if ( !elem ) {
@@ -192 +197 @@
             // Enforce the right trigger type
             data[0].type = type;
+            if ( exclusive )
+                data[0].exclusive = true;
 
             // Trigger the event
@@ -251 +258 @@
 
             // Filter the functions by class
-            if ( !parts[1] || handler.type == parts[1] ) {
+            if ( !parts[1] && !event.exclusive || handler.type == parts[1] ) {
                 var ret = handler.apply( this, args );
 

trunk/jquery/test/unit/core.js

@@ -1398 +1398 @@
 });
 
+test(".data()", function() {
+    expect(11);
+    var div = $("#foo");
+    ok( div.data("test") == undefined, "Check for no data exists" );
+    div.data("test", "success");
+    ok( div.data("test") == "success", "Check for added data" );
+    div.data("test", "overwritten");
+    ok( div.data("test") == "overwritten", "Check for overwritten data" );
+
+    var hits = 0;
+
+    div
+        .bind("set-test",function(){ hits += 1; })
+        .bind("set-test.foo",function(){ hits += 2; })
+
+    div.data("test.foo", "foodata");
+    ok( div.data("test") == "overwritten", "Check for original data" );
+    ok( div.data("test.foo") == "foodata", "Check for namespaced data" );
+    ok( div.data("test.bar") == "overwritten", "Check for unmatched namespace" );
+    ok( hits == 2, "Check triggered functions" );
+
+    hits = 0;
+
+    div.data("test", "overwritten2");
+    ok( div.data("test") == "overwritten2", "Check for original data" );
+    ok( div.data("test.foo") == "foodata", "Check for namespaced data" );
+    ok( div.data("test.bar") == "overwritten2", "Check for unmatched namespace" );
+    ok( hits == 1, "Check triggered functions" );
+});
+
 test("$.removeData", function() {
     expect(1);
@@ -1404 +1434 @@
     jQuery.removeData(div, "test");
     ok( jQuery.data(div, "test") == undefined, "Check removal of data" );
+});
+
+test(".removeData()", function() {
+    expect(6);
+    var div = $("#foo");
+    div.data("test", "testing");
+    div.removeData("test");
+    ok( div.data("test") == undefined, "Check removal of data" );
+
+    div.data("test", "testing");
+    div.data("test.foo", "testing2");
+    div.removeData("test.bar");
+    ok( div.data("test.foo") == "testing2", "Make sure data is intact" );
+    ok( div.data("test") == "testing", "Make sure data is intact" );
+
+    div.removeData("test");
+    ok( div.data("test.foo") == "testing2", "Make sure data is intact" );
+    ok( div.data("test") == undefined, "Make sure data is intact" );
+
+    div.removeData("test.foo");
+    ok( div.data("test.foo") == undefined, "Make sure data is intact" );
 });