diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/visual/menu/menubar.html | 2 | ||||
| -rw-r--r-- | tests/visual/menu/menubar.js | 17 |
2 files changed, 14 insertions, 5 deletions
diff --git a/tests/visual/menu/menubar.html b/tests/visual/menu/menubar.html index d10b83aef..180084edd 100644 --- a/tests/visual/menu/menubar.html +++ b/tests/visual/menu/menubar.html @@ -1,4 +1,4 @@ -<!doctype html> +<!DOCTYPE html> <html> <head> <title>Menu Visual Test: Default</title> diff --git a/tests/visual/menu/menubar.js b/tests/visual/menu/menubar.js index f384668d4..0aadef944 100644 --- a/tests/visual/menu/menubar.js +++ b/tests/visual/menu/menubar.js @@ -13,7 +13,7 @@ $.widget("ui.menubar", { }, _create: function() { var self = this; - var items = this.element.children("button, a"); + var items = this.items = this.element.children("button, a"); var o = this.options; this.element.addClass('ui-menubar ui-widget-header ui-helper-clearfix'); @@ -69,17 +69,26 @@ $.widget("ui.menubar", { }); $(document).click(function(event) { - !$(event.target).closest(".ui-menubar").length && items.next("ul").hide(); + !$(event.target).closest(".ui-menubar").length && self._close(); }); }, + _close: function() { + this.items.next("ul").hide(); + this.items.removeClass("ui-state-active"); + }, + _open: function(event, menu) { - this.active && this.active.menu("closeAll").hide(); + if (this.active) { + this.active.menu("closeAll").hide(); + this.active.prev().removeClass("ui-state-active"); + } + var button = menu.prev().addClass("ui-state-active"); this.active = menu.show().position({ my: "left top", at: "left bottom", offset: "0 -1", - of: menu.prev() + of: button }).focus(); }, |