diff options
| author | jzaefferer <joern.zaefferer@gmail.com> | 2011-02-24 16:39:08 +0100 |
|---|---|---|
| committer | jzaefferer <joern.zaefferer@gmail.com> | 2011-02-24 16:39:08 +0100 |
| commit | 84d59ded925b8b719805e2a37f6f5475c45ece31 (patch) | |
| tree | db4230e19dc5786a572bb2dc777a20d5ba2b86b4 | |
| parent | 7d03598f2cb00d25231a3efe5a8637be118dfb8b (diff) | |
| download | jquery-ui-84d59ded925b8b719805e2a37f6f5475c45ece31.tar.gz jquery-ui-84d59ded925b8b719805e2a37f6f5475c45ece31.zip | |
Menu: Update menubar to use menu instead of removed flyoutmenu.
| -rw-r--r-- | tests/visual/menu/menubar.html | 5 | ||||
| -rw-r--r-- | tests/visual/menu/menubar.js | 22 |
2 files changed, 16 insertions, 11 deletions
diff --git a/tests/visual/menu/menubar.html b/tests/visual/menu/menubar.html index c49abb2da..a3db019c2 100644 --- a/tests/visual/menu/menubar.html +++ b/tests/visual/menu/menubar.html @@ -10,7 +10,6 @@ <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.button.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.menu.js"></script> - <script type="text/javascript" src="flyoutmenu.js"></script> <script type="text/javascript" src="menubar.js"></script> <!-- <script type="text/javascript" src="http://jqueryui.com/themeroller/themeswitchertool/"></script> @@ -26,7 +25,6 @@ $(".menubar").menubar({ select: function(event, ui) { $("<div/>").text("Selected: " + ui.item.text()).appendTo("#log"); - ui.item.parents("ul:last").prev().focus() } }); }); @@ -46,6 +44,9 @@ <body> <div class="menubar ui-widget-header"> + <!-- + <a href="#">About...</a> + --> <a href="#">File</a> <ul> <li><a href="#">Open...</a></li> diff --git a/tests/visual/menu/menubar.js b/tests/visual/menu/menubar.js index a8f986349..8870e068a 100644 --- a/tests/visual/menu/menubar.js +++ b/tests/visual/menu/menubar.js @@ -5,14 +5,18 @@ */ (function($) { +// TODO take non-menubar buttons into account $.widget("ui.menubar", { _create: function() { var self = this; var items = this.element.children("button, a"); items.next("ul").each(function(i, elm) { - $(elm).flyoutmenu({ - select: self.options.select - }).hide().addClass("ui-menu-flyout").keydown(function(event) { + $(elm).menu({ + select: function(event, ui) { + ui.item.parents("ul:last").hide() + self.options.select.apply(this, arguments); + } + }).hide().keydown(function(event) { var menu = $(this); if (menu.is(":hidden")) return; @@ -54,8 +58,8 @@ $.widget("ui.menubar", { }, _open: function(event, menu) { - this.active && this.active.flyoutmenu("hide"); - this.active = menu.flyoutmenu("show").position({ + this.active && this.active.menu("closeAll").hide(); + this.active = menu.show().position({ my: "left top", at: "left bottom", offset: "0 -1", @@ -64,20 +68,20 @@ $.widget("ui.menubar", { }, left: function(event) { - var prev = this.active.prevAll( ".ui-menu-flyout" ).eq( 0 ); + var prev = this.active.prevAll( ".ui-menu" ).eq( 0 ); if (prev.length) { this._open(event, prev); } else { - this._open(event, this.element.children(".ui-menu-flyout:last")); + this._open(event, this.element.children(".ui-menu:last")); } }, right: function(event) { - var next = this.active.nextAll( ".ui-menu-flyout" ).eq( 0 ); + var next = this.active.nextAll( ".ui-menu" ).eq( 0 ); if (next.length) { this._open(event, next); } else { - this._open(event, this.element.children(".ui-menu-flyout:first")); + this._open(event, this.element.children(".ui-menu:first")); } } }); |