From da67ece506ab69ef2d6d6bc6c1cf60be48776d4c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Scott=20Gonz=C3=A1lez?= Date: Tue, 15 Mar 2011 14:02:18 -0400 Subject: [PATCH] Menu: Handle clicking on a menu item without hovering it first. Fixes #7085 - Menu click when no mouseover causes error. --- ui/jquery.ui.menu.js | 9 +++++++-- 1 file 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; -- 2.39.5