deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Tweaked the .data() event triggering - it now triggers a single 'setData' event, passing in a key value pair of what was changed.

Browse source
This commit is contained in:
John Resig 2008-02-03 17:56:21 +00:00
parent 703e89ba30
commit 4a11e6d70b
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core.js
View file

@ -479,15 +479,17 @@ jQuery.fn = jQuery.prototype = {
}, },
data: function( key, value ){ data: function( key, value ){
var parts = key.split(".");
if ( value == null ) { if ( value == null ) {
if ( this.length ) { if ( this.length ) {
var data = jQuery.data( this[0], key ); var data = jQuery.data( this[0], key );
return data == null ? return data == null ?
jQuery.data( this[0], key.split(".")[0] ) : jQuery.data( this[0], parts[0] ) :
data; data;
} }
} else } 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 ); jQuery.data( this, key, value );
}); });
}, },

24
test/unit/core.js
View file

@ -1406,25 +1406,25 @@ test(".data()", function() {
div.data("test", "overwritten"); div.data("test", "overwritten");
ok( div.data("test") == "overwritten", "Check for overwritten data" ); ok( div.data("test") == "overwritten", "Check for overwritten data" );
var hits = 0; var hits = {test:0};
div div
.bind("set-test",function(){ hits += 1; }) .bind("setData",function(e,key,value){ hits[key] += value; })
.bind("set-test.foo",function(){ hits += 2; }) .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") == "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( 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"); div.data("test", 1);
ok( div.data("test") == "overwritten2", "Check for original data" ); ok( div.data("test") == 1, "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") == "overwritten2", "Check for unmatched namespace" ); ok( div.data("test.bar") == 1, "Check for unmatched namespace" );
ok( hits == 1, "Check triggered functions" ); ok( hits.test == 1, "Check triggered functions" );
}); });
test("$.removeData", function() { test("$.removeData", function() {