Permalink
Browse files

Menu: Only set the mouseHandled flag if the event is going to bubble.…

… Fixes #9469: on( "menuselect" )

not firing every time.
  • Loading branch information...
tjvantoll committed Aug 2, 2013
1 parent a377088 commit 484e382259f1c1c56b151a97ddf8a894f94d17ea
Showing with 21 additions and 2 deletions.
  1. +15 −0 tests/unit/menu/menu_events.js
  2. +6 −2 ui/jquery.ui.menu.js
@@ -619,4 +619,19 @@ test( "ensure default is prevented when clicking on anchors in disabled menus ",
equal( logOutput(), "click,1,afterclick,disable,enable,3", "Click order not valid." );
});
test( "#9469: Stopping propagation in a select event should not suppress subsequent select events.", function() {
expect( 1 );
var element = $( "#menu1" ).menu({
select: function( event, ui ) {
log();
event.stopPropagation();
}
});
click( element, "1" );
click( element, "2" );
equal( logOutput(), "1,2", "Both select events were not triggered." );
});
})( jQuery );
View
@@ -75,9 +75,13 @@ $.widget( "ui.menu", {
"click .ui-menu-item:has(a)": function( event ) {
var target = $( event.target ).closest( ".ui-menu-item" );
if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
this.mouseHandled = true;
this.select( event );
// Only set the mouseHandled flag if the event will bubble, see #9469.
if ( !event.isPropagationStopped() ) {
this.mouseHandled = true;
}
// Open submenu on click
if ( target.has( ".ui-menu" ).length ) {
this.expand( event );

0 comments on commit 484e382

Please sign in to comment.