Skip to content
Permalink
Browse files

Fix "menubar does not collapse when clicking on other menubar" + mino…

…r changes
  • Loading branch information
hanshillen committed Apr 18, 2011
1 parent e448cd0 commit d77185a5a115174cf6ab8bf5224f652124008e19
Showing with 10 additions and 5 deletions.
  1. +2 −2 tests/visual/menu/menubar.html
  2. +7 −3 tests/visual/menu/menubar.js
  3. +1 −0 ui/jquery.ui.menu.js
@@ -55,13 +55,13 @@
.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; }

ol.ui-menubar, ul.ui-menubar {
.ui-menubar, .ui-menubar {
list-style: none;
margin-left: 0;
padding-left: 0;
}

li.ui-menubar-item {
.ui-menubar-item {
float: left;
}

@@ -67,7 +67,6 @@ $.widget("ui.menubar", {
return;
}
event.preventDefault();
event.stopPropagation();
if (event.type == "click" && menu.is(":visible") && self.active && self.active[0] == menu[0]) {
self._close();
return;
@@ -111,8 +110,11 @@ $.widget("ui.menubar", {
});
self._bind(document, {
click: function(event) {
if (self.open && !$(event.target).closest(".ui-menubar").length) {
self._close();
if (self.open) {
var menubar = $(event.target).closest(".ui-menubar");
if (!menubar.length || menubar.get(0) !== self.element.get(0)) {
self._close();
}
}
}
})
@@ -162,6 +164,8 @@ $.widget("ui.menubar", {
},

_close: function() {
if (!this.active || !this.active.length)
return;
this.active.menu("closeAll").hide().attr("aria-hidden", "true").attr("aria-expanded", "false");
this.active.prev().removeClass("ui-state-active").removeAttr("tabIndex");
this.active = null;
@@ -319,6 +319,7 @@ $.widget("ui.menu", {
if (newItem && newItem.length) {
this._open(newItem.parent());
var current = this.active;
//timeout so Firefox will not hide activedescendant change in expanding submenu from AT
setTimeout(function(){self.focus(event, newItem)}, 20);
return true;
}

0 comments on commit d77185a

Please sign in to comment.
You can’t perform that action at this time.