library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Menubar: Fix closing with escape key

Browse Source
This commit is contained in:
jzaefferer 2011-03-17 15:26:06 +01:00
parent 133137b39b
commit 24d1952045
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/visual/menu/menubar.js
View File

@ -50,13 +50,17 @@ $.widget("ui.menubar", {
menu = input.next("ul");
input.bind("click focus mouseenter", function(event) {
// ignore triggered focus event
if (event.type == "focus" && !event.originalEvent) {
return;
}
event.preventDefault();
event.stopPropagation();
if (menu.is(":visible") && self.active && self.active[0] == menu[0]) {
self._close();
return;
}
if (menu.length && (self.open || event.type == "click")) {
if (self.open || event.type == "click") {
self._open(event, menu);
}
})
@ -98,11 +102,11 @@ $.widget("ui.menubar", {
})
self._bind({
keyup: function(event) {
if (event.keyCode == $.ui.keyCode.ESCAPE) {
if (event.keyCode == $.ui.keyCode.ESCAPE && self.open) {
if (self.active.menu("left", event) !== true) {
self._close( event );
// bypass the focus event handler above
self.active.prev()[0].focus();
var active = self.active;
self.active.blur();
active.prev().focus();
}
}
}