Commit 9fabe202 authored by Dave Methvin's avatar Dave Methvin

Don't run direct handlers if delegate did .stopPropagation().

parent c4cc343c
......@@ -459,7 +459,7 @@ jQuery.event = {
delete event.delegateTarget;
// Run non-delegated handlers for this level
if ( handlers.length ) {
if ( handlers.length && !event.isPropagationStopped() ) {
dispatch( this, event, handlers, args );
}
......
......@@ -2054,6 +2054,22 @@ test(".delegate()/.undelegate()", function() {
jQuery("#body").undelegate("#nothiddendiv div", "click");
});
test("stopPropagation() stops directly-bound events on delegated target", function() {
expect(1);
var markup = jQuery( '<div><p><a href="#">target</a></p></div>' );
markup
.on( "click", function() {
ok( false, "directly-bound event on delegate target was called" );
})
.on( "click", "a", function( e ) {
e.stopPropagation();
ok( true, "delegated handler was called" );
})
.find("a").click().end()
.remove();
});
test("undelegate all bound events", function(){
expect(1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment