diff options
| author | John Resig <jeresig@gmail.com> | 2010-07-27 13:45:32 -0400 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2010-07-27 13:45:32 -0400 |
| commit | c4b4df469161ed3c3d372ebed342261efd413ac1 (patch) | |
| tree | 552b5dee32889f8bc6cf9d4d414d5c45f67fbb5c /src/data.js | |
| parent | 646fbea561ce5319d888780c20f0c0f03b8daad3 (diff) | |
| download | jquery-c4b4df469161ed3c3d372ebed342261efd413ac1.tar.gz jquery-c4b4df469161ed3c3d372ebed342261efd413ac1.zip | |
Make sure that .data() events don't bubble, per the discussion in 2e10af143b7eafb7142524f6534a62aee1910bd1. Fixes #6832.
Diffstat (limited to 'src/data.js')
| -rw-r--r-- | src/data.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/data.js b/src/data.js index eb96b860f..d38d47d3c 100644 --- a/src/data.js +++ b/src/data.js @@ -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 ); }); } }, |