fix(menu-bar): fix embeded menus closing immediately

closes #6184, closes #5866
angular · Dec 14, 2015 · 62af938 · 62af938
1 parent 86ec22a
commit 62af938
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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();