diff options
| -rw-r--r-- | tests/visual/index.html | 3 | ||||
| -rw-r--r-- | tests/visual/menu/flyoutmenu.html (renamed from tests/visual/menu/nested.html) | 0 | ||||
| -rw-r--r-- | tests/visual/menu/flyoutmenu.js | 11 | ||||
| -rw-r--r-- | tests/visual/menu/menubar.js | 8 |
4 files changed, 8 insertions, 14 deletions
diff --git a/tests/visual/index.html b/tests/visual/index.html index 2a556dc89..4138e21ba 100644 --- a/tests/visual/index.html +++ b/tests/visual/index.html @@ -46,7 +46,8 @@ <a href="menu/menu.html">Menu</a> <ul> <li><a href="menu/contextmenu.html">Context Menu</a></li> - <li><a href="menu/nested.html">Nested Menu</a></li> + <li><a href="menu/flyoutmenu.html">Flyout Menu</a></li> + <li><a href="menu/menubar.html">Menubar</a></li> <li><a href="menu/drilldown.html">Drilldown Menu</a></li> </ul> </li> diff --git a/tests/visual/menu/nested.html b/tests/visual/menu/flyoutmenu.html index 8240689df..8240689df 100644 --- a/tests/visual/menu/nested.html +++ b/tests/visual/menu/flyoutmenu.html diff --git a/tests/visual/menu/flyoutmenu.js b/tests/visual/menu/flyoutmenu.js index 54ee8bb67..665426796 100644 --- a/tests/visual/menu/flyoutmenu.js +++ b/tests/visual/menu/flyoutmenu.js @@ -1,12 +1,7 @@ /* - * jQuery UI flyout menu - * - written for jQuery UI 1.9 milestone 2 using the widget factory - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * modified from: http://view.jqueryui.com/menu/tests/visual/menu/nested.html - * by: Michael Lang, http://nexul.com/ + * jQuery UI flyoutmenu * + * backported from Michael Lang's fork: http://www.nexul.com/prototypes/toolbar/demo.html */ (function($) { @@ -64,11 +59,13 @@ $.widget("ui.flyoutmenu", { return value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"); } var match = self.activeItem.parent("ul").children("li").filter(function() { + // TODO why filter child anchor here, but not in the filter below? return new RegExp("^" + escape(character), "i").test($("a", this).text()); }); var match = skip && match.index(self.active.next()) != -1 ? match.next() : match; if (!match.length) { character = String.fromCharCode(event.keyCode); + // TODO why use self.widget() here instead of self.activeItem?? match = self.widget().children("li").filter(function() { return new RegExp("^" + escape(character), "i").test($(this).text()); }); diff --git a/tests/visual/menu/menubar.js b/tests/visual/menu/menubar.js index a6bf636e0..b660ea0df 100644 --- a/tests/visual/menu/menubar.js +++ b/tests/visual/menu/menubar.js @@ -1,11 +1,7 @@ /* - * jQuery UI flyout menu - * - written for jQuery UI 1.9 milestone 2 using the widget factory - * - * Copyright (c) 2010 Michael Lang, http://nexul.com/ - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. + * jQuery UI menubar * + * backported from Michael Lang's fork: http://www.nexul.com/prototypes/toolbar/demo.html */ (function($) { |