diff options
author | Hans Hillen <hans.hillen@gmail.com> | 2011-04-20 20:15:26 +0200 |
---|---|---|
committer | Hans Hillen <hans.hillen@gmail.com> | 2011-04-20 20:15:26 +0200 |
commit | 03132f93fc961fc23771b1784ada7d46c104dea1 (patch) | |
tree | e8b138259de833b1e89eea834b1c29d2ce2e2ed5 /tests/visual/menu | |
parent | d77185a5a115174cf6ab8bf5224f652124008e19 (diff) | |
download | jquery-ui-03132f93fc961fc23771b1784ada7d46c104dea1.tar.gz jquery-ui-03132f93fc961fc23771b1784ada7d46c104dea1.zip |
Fix menubar escape key + minor css fix
Diffstat (limited to 'tests/visual/menu')
-rw-r--r-- | tests/visual/menu/menubar.html | 4 | ||||
-rw-r--r-- | tests/visual/menu/menubar.js | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/visual/menu/menubar.html b/tests/visual/menu/menubar.html index 1b4b331f6..d2185e97c 100644 --- a/tests/visual/menu/menubar.html +++ b/tests/visual/menu/menubar.html @@ -55,9 +55,9 @@ .ui-menubar .ui-button { float: left; font-weight: normal; border-top-width: 0 !important; border-bottom-width: 0 !important; margin: 0; outline: none; } .ui-menubar .ui-menubar-link { border-right: 1px dashed transparent; border-left: 1px dashed transparent; } - .ui-menubar, .ui-menubar { + .ui-menubar { list-style: none; - margin-left: 0; + margin: 0; padding-left: 0; } diff --git a/tests/visual/menu/menubar.js b/tests/visual/menu/menubar.js index e6f6ab069..13a508811 100644 --- a/tests/visual/menu/menubar.js +++ b/tests/visual/menu/menubar.js @@ -38,7 +38,6 @@ $.widget("ui.menubar", { var menu = $(this); if (menu.is(":hidden")) return; - event.stopPropagation(); switch (event.keyCode) { case $.ui.keyCode.LEFT: self._left(event); @@ -119,7 +118,7 @@ $.widget("ui.menubar", { } }) self._bind({ - keyup: function(event) { + keydown: function(event) { if (event.keyCode == $.ui.keyCode.ESCAPE && self.open) { if (self.active.menu("left", event) !== true) { var active = self.active; |