Honor stopImmediatePropagation for live/delegate event handlers. Fixes #7217.
This commit is contained in:
parent
ee845c4975
commit
974b5aeab7
|
@ -1132,6 +1132,9 @@ function liveHandler( event ) {
|
||||||
if ( ret === false ) {
|
if ( ret === false ) {
|
||||||
stop = false;
|
stop = false;
|
||||||
}
|
}
|
||||||
|
if ( event.isImmediatePropagationStopped() ) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -265,6 +265,36 @@ test("live/die(Object), delegate/undelegate(String, Object)", function() {
|
||||||
equals( mouseoverCounter, 4, "die" );
|
equals( mouseoverCounter, 4, "die" );
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("live/delegate immediate propagation", function() {
|
||||||
|
expect(2);
|
||||||
|
|
||||||
|
var $p = jQuery("#firstp"), $a = $p.find("a:first"), lastClick;
|
||||||
|
|
||||||
|
lastClick = "";
|
||||||
|
$a.live( "click", function(e) {
|
||||||
|
lastClick = "click1";
|
||||||
|
e.stopImmediatePropagation();
|
||||||
|
});
|
||||||
|
$a.live( "click", function(e) {
|
||||||
|
lastClick = "click2";
|
||||||
|
});
|
||||||
|
$a.trigger( "click" );
|
||||||
|
equals( lastClick, "click1", "live stopImmediatePropagation" );
|
||||||
|
$a.die( "click" );
|
||||||
|
|
||||||
|
lastClick = "";
|
||||||
|
$p.delegate( "a", "click", function(e) {
|
||||||
|
lastClick = "click1";
|
||||||
|
e.stopImmediatePropagation();
|
||||||
|
});
|
||||||
|
$p.delegate( "a", "click", function(e) {
|
||||||
|
lastClick = "click2";
|
||||||
|
});
|
||||||
|
$a.trigger( "click" );
|
||||||
|
equals( lastClick, "click1", "delegate stopImmediatePropagation" );
|
||||||
|
$p.undelegate( "click" );
|
||||||
|
});
|
||||||
|
|
||||||
test("bind(), iframes", function() {
|
test("bind(), iframes", function() {
|
||||||
// events don't work with iframes, see #939 - this test fails in IE because of contentDocument
|
// events don't work with iframes, see #939 - this test fails in IE because of contentDocument
|
||||||
var doc = jQuery("#loadediframe").contents();
|
var doc = jQuery("#loadediframe").contents();
|
||||||
|
|
Loading…
Reference in a new issue