Skip to content
Permalink
Browse files

Tweaked the .data() event triggering - it now triggers a single 'setD…

…ata' event, passing in a key value pair of what was changed.
  • Loading branch information
jeresig committed Feb 3, 2008
1 parent 703e89b commit 4a11e6d70b5c4b1473b62050929cffe3d2a67317
Showing with 16 additions and 14 deletions.
  1. +4 −2 src/core.js
  2. +12 −12 test/unit/core.js
@@ -479,15 +479,17 @@ jQuery.fn = jQuery.prototype = {
},

data: function( key, value ){
var parts = key.split(".");

if ( value == null ) {
if ( this.length ) {
var data = jQuery.data( this[0], key );
return data == null ?
jQuery.data( this[0], key.split(".")[0] ) :
jQuery.data( this[0], parts[0] ) :
data;
}
} else
return this.trigger("set-" + key + "!", [value]).each(function(){
return this.trigger("setData" + (parts[1] ? "." + parts[1] : "") + "!", [parts[0], value]).each(function(){
jQuery.data( this, key, value );
});
},
@@ -1406,25 +1406,25 @@ test(".data()", function() {
div.data("test", "overwritten");
ok( div.data("test") == "overwritten", "Check for overwritten data" );

var hits = 0;
var hits = {test:0};

div
.bind("set-test",function(){ hits += 1; })
.bind("set-test.foo",function(){ hits += 2; })
.bind("setData",function(e,key,value){ hits[key] += value; })
.bind("setData.foo",function(e,key,value){ hits[key] += value; })

div.data("test.foo", "foodata");
div.data("test.foo", 2);
ok( div.data("test") == "overwritten", "Check for original data" );
ok( div.data("test.foo") == "foodata", "Check for namespaced data" );
ok( div.data("test.foo") == 2, "Check for namespaced data" );
ok( div.data("test.bar") == "overwritten", "Check for unmatched namespace" );
ok( hits == 2, "Check triggered functions" );
ok( hits.test == 2, "Check triggered functions" );

hits = 0;
hits.test = 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" );
div.data("test", 1);
ok( div.data("test") == 1, "Check for original data" );
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" );
});

test("$.removeData", function() {

0 comments on commit 4a11e6d

Please sign in to comment.
You can’t perform that action at this time.