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

Make sure that live events bubble unless explicitly told not to, like a normal event. Fixes #6182.

Browse source
This commit is contained in:
jeresig 2010-02-26 09:26:14 -05:00
parent 7e6b20e2e8
commit 26b0e913dd
3 changed files with 56 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/event.js
View file

@ -984,8 +984,8 @@ jQuery.each(["live", "die"], function( i, name ) {
}); });
function liveHandler( event ) { function liveHandler( event ) {
var stop, elems = [], selectors = [], args = arguments, var stop, maxLevel, elems = [], selectors = [],
related, match, handleObj, elem, j, i, l, data, related, match, handleObj, elem, j, i, l, data, close,
events = jQuery.data( this, "events" ); events = jQuery.data( this, "events" );
// Make sure we avoid non-left-click bubbling in Firefox (#3861) // Make sure we avoid non-left-click bubbling in Firefox (#3861)
@ -1011,11 +1011,13 @@ function liveHandler( event ) {
match = jQuery( event.target ).closest( selectors, event.currentTarget ); match = jQuery( event.target ).closest( selectors, event.currentTarget );
for ( i = 0, l = match.length; i < l; i++ ) { for ( i = 0, l = match.length; i < l; i++ ) {
close = match[i];
for ( j = 0; j < live.length; j++ ) { for ( j = 0; j < live.length; j++ ) {
handleObj = live[j]; handleObj = live[j];
if ( match[i].selector === handleObj.selector ) { if ( close.selector === handleObj.selector ) {
elem = match[i].elem; elem = close.elem;
related = null; related = null;
// Those two events require additional checking // Those two events require additional checking
@ -1024,7 +1026,7 @@ function liveHandler( event ) {
} }
if ( !related || related !== elem ) { if ( !related || related !== elem ) {
elems.push({ elem: elem, handleObj: handleObj }); elems.push({ elem: elem, handleObj: handleObj, level: close.level });
} }
} }
} }
@ -1032,13 +1034,23 @@ function liveHandler( event ) {
for ( i = 0, l = elems.length; i < l; i++ ) { for ( i = 0, l = elems.length; i < l; i++ ) {
match = elems[i]; match = elems[i];
if ( maxLevel && match.level > maxLevel ) {
break;
}
event.currentTarget = match.elem; event.currentTarget = match.elem;
event.data = match.handleObj.data; event.data = match.handleObj.data;
event.handleObj = match.handleObj; event.handleObj = match.handleObj;
if ( match.handleObj.origHandler.apply( match.elem, args ) === false ) { ret = match.handleObj.origHandler.apply( match.elem, arguments );
if ( ret === false || event.isPropagationStopped() ) {
maxLevel = match.level;
if ( ret === false ) {
stop = false; stop = false;
break; }
} }
} }

6
src/traversing.js
View file

@ -82,7 +82,7 @@ jQuery.fn.extend({
closest: function( selectors, context ) { closest: function( selectors, context ) {
if ( jQuery.isArray( selectors ) ) { if ( jQuery.isArray( selectors ) ) {
var ret = [], cur = this[0], match, matches = {}, selector; var ret = [], cur = this[0], match, matches = {}, selector, level = 1;
if ( cur && selectors.length ) { if ( cur && selectors.length ) {
for ( var i = 0, l = selectors.length; i < l; i++ ) { for ( var i = 0, l = selectors.length; i < l; i++ ) {
@ -100,11 +100,11 @@ jQuery.fn.extend({
match = matches[selector]; match = matches[selector];
if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) { if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
ret.push({ selector: selector, elem: cur }); ret.push({ selector: selector, elem: cur, level: level });
delete matches[selector];
} }
} }
cur = cur.parentNode; cur = cur.parentNode;
level++;
} }
} }

58
test/unit/event.js
View file

@ -799,7 +799,7 @@ test(".live()/.die()", function() {
submit = 0, div = 0, livea = 0, liveb = 0; submit = 0, div = 0, livea = 0, liveb = 0;
jQuery("div#nothiddendivchild").trigger("click"); jQuery("div#nothiddendivchild").trigger("click");
equals( submit, 0, "Click on inner div" ); equals( submit, 0, "Click on inner div" );
equals( div, 1, "Click on inner div" ); equals( div, 2, "Click on inner div" );
equals( livea, 1, "Click on inner div" ); equals( livea, 1, "Click on inner div" );
equals( liveb, 1, "Click on inner div" ); equals( liveb, 1, "Click on inner div" );
@ -815,7 +815,7 @@ test(".live()/.die()", function() {
submit = 0, div = 0, livea = 0, liveb = 0; submit = 0, div = 0, livea = 0, liveb = 0;
jQuery("div#nothiddendivchild").trigger("click"); jQuery("div#nothiddendivchild").trigger("click");
equals( submit, 0, "die Click on inner div" ); equals( submit, 0, "die Click on inner div" );
equals( div, 1, "die Click on inner div" ); equals( div, 2, "die Click on inner div" );
equals( livea, 1, "die Click on inner div" ); equals( livea, 1, "die Click on inner div" );
equals( liveb, 1, "die Click on inner div" ); equals( liveb, 1, "die Click on inner div" );
@ -824,7 +824,7 @@ test(".live()/.die()", function() {
jQuery("div#nothiddendivchild").die("click"); jQuery("div#nothiddendivchild").die("click");
jQuery("div#nothiddendivchild").trigger("click"); jQuery("div#nothiddendivchild").trigger("click");
equals( submit, 0, "die Click on inner div" ); equals( submit, 0, "die Click on inner div" );
equals( div, 1, "die Click on inner div" ); equals( div, 2, "die Click on inner div" );
equals( livea, 1, "die Click on inner div" ); equals( livea, 1, "die Click on inner div" );
equals( liveb, 0, "die Click on inner div" ); equals( liveb, 0, "die Click on inner div" );
@ -842,7 +842,7 @@ test(".live()/.die()", function() {
jQuery("div#nothiddendivchild").trigger("click"); jQuery("div#nothiddendivchild").trigger("click");
equals( submit, 0, "stopPropagation Click on inner div" ); equals( submit, 0, "stopPropagation Click on inner div" );
equals( div, 1, "stopPropagation Click on inner div" ); equals( div, 1, "stopPropagation Click on inner div" );
equals( livea, 1, "stopPropagation Click on inner div" ); equals( livea, 0, "stopPropagation Click on inner div" );
equals( liveb, 1, "stopPropagation Click on inner div" ); equals( liveb, 1, "stopPropagation Click on inner div" );
// Make sure click events only fire with primary click // Make sure click events only fire with primary click
@ -1252,6 +1252,7 @@ test(".delegate()/.undelegate()", function() {
equals( liveb, 0, "Click on body" ); equals( liveb, 0, "Click on body" );
// This should trigger two events // This should trigger two events
submit = 0, div = 0, livea = 0, liveb = 0;
jQuery("div#nothiddendiv").trigger("click"); jQuery("div#nothiddendiv").trigger("click");
equals( submit, 0, "Click on div" ); equals( submit, 0, "Click on div" );
equals( div, 1, "Click on div" ); equals( div, 1, "Click on div" );
@ -1259,55 +1260,62 @@ test(".delegate()/.undelegate()", function() {
equals( liveb, 0, "Click on div" ); equals( liveb, 0, "Click on div" );
// This should trigger three events (w/ bubbling) // This should trigger three events (w/ bubbling)
submit = 0, div = 0, livea = 0, liveb = 0;
jQuery("div#nothiddendivchild").trigger("click"); jQuery("div#nothiddendivchild").trigger("click");
equals( submit, 0, "Click on inner div" ); equals( submit, 0, "Click on inner div" );
equals( div, 2, "Click on inner div" ); equals( div, 2, "Click on inner div" );
equals( livea, 2, "Click on inner div" ); equals( livea, 1, "Click on inner div" );
equals( liveb, 1, "Click on inner div" ); equals( liveb, 1, "Click on inner div" );
// This should trigger one submit // This should trigger one submit
submit = 0, div = 0, livea = 0, liveb = 0;
jQuery("div#nothiddendivchild").trigger("submit"); jQuery("div#nothiddendivchild").trigger("submit");
equals( submit, 1, "Submit on div" ); equals( submit, 1, "Submit on div" );
equals( div, 2, "Submit on div" ); equals( div, 0, "Submit on div" );
equals( livea, 2, "Submit on div" ); equals( livea, 0, "Submit on div" );
equals( liveb, 1, "Submit on div" ); equals( liveb, 0, "Submit on div" );
// Make sure no other events were removed in the process // Make sure no other events were removed in the process
submit = 0, div = 0, livea = 0, liveb = 0;
jQuery("div#nothiddendivchild").trigger("click"); jQuery("div#nothiddendivchild").trigger("click");
equals( submit, 1, "undelegate Click on inner div" ); equals( submit, 0, "undelegate Click on inner div" );
equals( div, 3, "undelegate Click on inner div" ); equals( div, 2, "undelegate Click on inner div" );
equals( livea, 3, "undelegate Click on inner div" ); equals( livea, 1, "undelegate Click on inner div" );
equals( liveb, 2, "undelegate Click on inner div" ); equals( liveb, 1, "undelegate Click on inner div" );
// Now make sure that the removal works // Now make sure that the removal works
submit = 0, div = 0, livea = 0, liveb = 0;
jQuery("#body").undelegate("div#nothiddendivchild", "click"); jQuery("#body").undelegate("div#nothiddendivchild", "click");
jQuery("div#nothiddendivchild").trigger("click"); jQuery("div#nothiddendivchild").trigger("click");
equals( submit, 1, "undelegate Click on inner div" ); equals( submit, 0, "undelegate Click on inner div" );
equals( div, 4, "undelegate Click on inner div" ); equals( div, 2, "undelegate Click on inner div" );
equals( livea, 4, "undelegate Click on inner div" ); equals( livea, 1, "undelegate Click on inner div" );
equals( liveb, 2, "undelegate Click on inner div" ); equals( liveb, 0, "undelegate Click on inner div" );
// Make sure that the click wasn't removed too early // Make sure that the click wasn't removed too early
submit = 0, div = 0, livea = 0, liveb = 0;
jQuery("div#nothiddendiv").trigger("click"); jQuery("div#nothiddendiv").trigger("click");
equals( submit, 1, "undelegate Click on inner div" ); equals( submit, 0, "undelegate Click on inner div" );
equals( div, 5, "undelegate Click on inner div" ); equals( div, 1, "undelegate Click on inner div" );
equals( livea, 5, "undelegate Click on inner div" ); equals( livea, 1, "undelegate Click on inner div" );
equals( liveb, 2, "undelegate Click on inner div" ); equals( liveb, 0, "undelegate Click on inner div" );
// Make sure that stopPropgation doesn't stop live events // Make sure that stopPropgation doesn't stop live events
submit = 0, div = 0, livea = 0, liveb = 0;
jQuery("#body").delegate("div#nothiddendivchild", "click", function(e){ liveb++; e.stopPropagation(); }); jQuery("#body").delegate("div#nothiddendivchild", "click", function(e){ liveb++; e.stopPropagation(); });
jQuery("div#nothiddendivchild").trigger("click"); jQuery("div#nothiddendivchild").trigger("click");
equals( submit, 1, "stopPropagation Click on inner div" ); equals( submit, 0, "stopPropagation Click on inner div" );
equals( div, 6, "stopPropagation Click on inner div" ); equals( div, 1, "stopPropagation Click on inner div" );
equals( livea, 6, "stopPropagation Click on inner div" ); equals( livea, 0, "stopPropagation Click on inner div" );
equals( liveb, 3, "stopPropagation Click on inner div" ); equals( liveb, 1, "stopPropagation Click on inner div" );
// Make sure click events only fire with primary click // Make sure click events only fire with primary click
submit = 0, div = 0, livea = 0, liveb = 0;
var event = jQuery.Event("click"); var event = jQuery.Event("click");
event.button = 1; event.button = 1;
jQuery("div#nothiddendiv").trigger(event); jQuery("div#nothiddendiv").trigger(event);
equals( livea, 6, "delegate secondary click" ); equals( livea, 0, "delegate secondary click" );
jQuery("#body").undelegate("div#nothiddendivchild", "click"); jQuery("#body").undelegate("div#nothiddendivchild", "click");
jQuery("#body").undelegate("div#nothiddendiv", "click"); jQuery("#body").undelegate("div#nothiddendiv", "click");