mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
Make sure that .data() events don't bubble, per the discussion in 2e10af143b
. Fixes #6832.
This commit is contained in:
parent
646fbea561
commit
c4b4df4691
@ -143,13 +143,18 @@ jQuery.fn.extend({
|
||||
if ( data === undefined && this.length ) {
|
||||
data = jQuery.data( this[0], key );
|
||||
}
|
||||
|
||||
return data === undefined && parts[1] ?
|
||||
this.data( parts[0] ) :
|
||||
data;
|
||||
|
||||
} else {
|
||||
return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
|
||||
return this.each(function() {
|
||||
var $this = jQuery( this ), args = [ parts[0], value ];
|
||||
|
||||
$this.triggerHandler( "setData" + parts[1] + "!", args );
|
||||
jQuery.data( this, key, value );
|
||||
jQuery.event.trigger( "changeData" + parts[1] + "!", [parts[0], value], this );
|
||||
$this.triggerHandler( "changeData" + parts[1] + "!", args );
|
||||
});
|
||||
}
|
||||
},
|
||||
|
@ -70,7 +70,13 @@ test(".data()", function() {
|
||||
|
||||
test(".data(String) and .data(String, Object)", function() {
|
||||
expect(27);
|
||||
var div = jQuery("<div/>");
|
||||
var parent = jQuery("<div><div></div></div>"),
|
||||
div = parent.children();
|
||||
|
||||
parent
|
||||
.bind("getData", function(){ ok( false, "getData bubbled." ) })
|
||||
.bind("setData", function(){ ok( false, "setData bubbled." ) })
|
||||
.bind("changeData", function(){ ok( false, "changeData bubbled." ) });
|
||||
|
||||
ok( div.data("test") === undefined, "Check for no data exists" );
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user