diff options
| author | jzaefferer <joern.zaefferer@gmail.com> | 2010-12-22 18:31:27 +0100 |
|---|---|---|
| committer | jzaefferer <joern.zaefferer@gmail.com> | 2010-12-22 18:31:27 +0100 |
| commit | 3552947c19b8ea1b779dc9809783c6ac6a218d68 (patch) | |
| tree | 61b23078b9ff83f65bd5258bc4dd9efed5ac5f7a /tests/visual/menu/nested.html | |
| parent | 8d39171fa285519203688084f3cf66c1e2ae0ada (diff) | |
| parent | 70e8e9f294729f120f7b52fb9803fddfd37e464e (diff) | |
| download | jquery-ui-3552947c19b8ea1b779dc9809783c6ac6a218d68.tar.gz jquery-ui-3552947c19b8ea1b779dc9809783c6ac6a218d68.zip | |
Merge remote branch 'origin/menu'
Conflicts:
demos/autocomplete/categories.html
demos/autocomplete/combobox.html
demos/autocomplete/custom-data.html
demos/autocomplete/default.html
demos/autocomplete/folding.html
demos/autocomplete/multiple-remote.html
demos/autocomplete/multiple.html
demos/autocomplete/remote-jsonp.html
demos/autocomplete/remote-with-cache.html
demos/autocomplete/remote.html
demos/autocomplete/xml.html
demos/button/splitbutton.html
demos/index.html
tests/visual/menu/nested.html
themes/base/jquery.ui.autocomplete.css
ui/jquery.ui.autocomplete.js
Diffstat (limited to 'tests/visual/menu/nested.html')
| -rw-r--r-- | tests/visual/menu/nested.html | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/visual/menu/nested.html b/tests/visual/menu/nested.html index c7f9a0914..2508c55c4 100644 --- a/tests/visual/menu/nested.html +++ b/tests/visual/menu/nested.html @@ -8,8 +8,8 @@ <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.autocomplete.js"></script> - <script type="text/javascript" src="../../../external/jquery.bgiframe-2.1.2.js"></script> + <script type="text/javascript" src="../../../ui/jquery.ui.menu.js"></script> + <script type="text/javascript" src="../../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="http://jqueryui.com/themeroller/themeswitchertool/"></script> <script type="text/javascript"> $(function() { @@ -28,7 +28,9 @@ this.element.find("ul").hide().prev("a").prepend('<span class="ui-icon ui-icon-carat-1-e"></span>'); this.element.find("ul").andSelf().menu({ - selected: this.options.selected, + // disable built-in key handling + input: $(), + select: this.options.select, focus: function(event, ui) { self.active = ui.item.parent(); self.activeItem = ui.item; @@ -75,7 +77,7 @@ }); var nestedmenu = $("#menu").nestedmenu({ - selected: function(event, ui) { + select: function(event, ui) { $("#log").append("<div>Selected " + ui.item.text() + "</div>"); } }).hide(); |