aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.menu.js
diff options
context:
space:
mode:
Diffstat (limited to 'ui/jquery.ui.menu.js')
-rw-r--r--ui/jquery.ui.menu.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index cd07b6418..2addba37e 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -34,14 +34,19 @@ $.widget("ui.menu", {
role: "listbox"
})
.bind( "click.menu", function( event ) {
+ var item = $( event.target ).closest( ".ui-menu-item:has(a)" );
if ( self.options.disabled ) {
return false;
}
- if ( !$( event.target ).closest( ".ui-menu-item a" ).length ) {
+ if ( !item.length ) {
return;
}
// temporary
event.preventDefault();
+ // it's possible to click an item without hovering it (#7085)
+ if ( !self.active || ( self.active[ 0 ] !== item[ 0 ] ) ) {
+ self.focus( event, item );
+ }
self.select( event );
})
.bind( "mouseover.menu", function( event ) {
@@ -102,7 +107,7 @@ $.widget("ui.menu", {
event.preventDefault();
break;
case $.ui.keyCode.ENTER:
- self.select();
+ self.select( event );
event.preventDefault();
event.stopImmediatePropagation();
break;