Menu: Make keyboard focus matching take submenus into account

diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index af1101f73111a73faf3472bd7c35a4fe26efb452..f233aeeb0f7b2ed81df4369caf91e3c92689614d 100644 (file)
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -132,13 +132,13 @@ $.widget("ui.menu", {
                                function escape(value) {
                                        return value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
                                }
-                               var match = self.widget().children(".ui-menu-item").filter(function() {
+                               var match = self.activeMenu.children(".ui-menu-item").filter(function() {
                                        return new RegExp("^" + escape(character), "i").test($(this).children("a").text());
                                });
                                var match = skip && match.index(self.active.next()) != -1 ? self.active.nextAll(".ui-menu-item") : match;
                                if (!match.length) {
                                        character = String.fromCharCode(event.keyCode);
-                                       match = self.widget().children(".ui-menu-item").filter(function() {
+                                       match = self.activeMenu.children(".ui-menu-item").filter(function() {
                                                return new RegExp("^" + escape(character), "i").test($(this).children("a").text());
                                        });
                                }