From 62af938781c24693c94e305d92946d4b85bb7b78 Mon Sep 17 00:00:00 2001 From: Ryan Schmukler Date: Mon, 14 Dec 2015 17:03:26 -0500 Subject: [PATCH] fix(menu-bar): fix embeded menus closing immediately closes #6184, closes #5866 --- src/components/menu/js/menuController.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/menu/js/menuController.js b/src/components/menu/js/menuController.js index c2bae9451cb..c0e8dd51337 100644 --- a/src/components/menu/js/menuController.js +++ b/src/components/menu/js/menuController.js @@ -57,7 +57,7 @@ function MenuController($mdMenu, $attrs, $element, $scope, $mdUtil, $timeout, $r self.currentlyOpenMenu = undefined; } })); - menuItems = angular.element($mdUtil.nodesToArray(menuContainer[0].querySelectorAll('md-menu-item'))); + menuItems = angular.element($mdUtil.nodesToArray(menuContainer[0].children[0].children)); menuItems.on('mouseenter', self.handleMenuItemHover); menuItems.on('mouseleave', self.handleMenuItemMouseLeave); }; @@ -86,8 +86,8 @@ function MenuController($mdMenu, $attrs, $element, $scope, $mdUtil, $timeout, $r self.currentlyOpenMenu.close(true, { closeTo: closeTo }); } else if (nestedMenu && !nestedMenu.isOpen && nestedMenu.open) { self.isAlreadyOpening = true; + nestedMenu.open(); } - nestedMenu && nestedMenu.open(); }, nestedMenu ? 100 : 250); var focusableTarget = event.currentTarget.querySelector('button:not([disabled])'); focusableTarget && focusableTarget.focus();