Fix menubar escape key + minor css fix

diff --git a/tests/visual/menu/menubar.html b/tests/visual/menu/menubar.html
index 1b4b331f610c835f7eed306f87c79584c489ddd4..d2185e97c12716e53ca5fbbdfa9a9f46e1f64e6f 100644 (file)
--- 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 e6f6ab069a3e4d537b38b51b0268c120da3bdc51..13a508811d8db67d1c8bb2cb5d0c4bfcaf0704f3 100644 (file)
--- 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;