fix(menu): fix options with x-ng-click and data-ng-click not working

closes #3258, references #3252

Author: rschmukler

src/components/menu/menu-interim-element.js

@@ -148,7 +148,7 @@ function MenuProvider($$interimElementProvider) {
           // Traverse up the event until we get to the menuContentEl to see if
           // there is an ng-click and that the ng-click is not disabled
           do {
-            if (target && target.hasAttribute('ng-click')) {
+            if (hasAnyAttribute(target, ['ng-click', 'data-ng-click', 'x-ng-click'])) {
               if (!target.hasAttribute('disabled')) {
                 close();
               }
@@ -161,6 +161,16 @@ function MenuProvider($$interimElementProvider) {
               opts.mdMenuCtrl.close();
             });
           }
+
+          function hasAnyAttribute(target, attrs) {
+            if (!target) return false;
+            for (var i = 0, attr; attr = attrs[i]; ++i) {
+              if (target.hasAttribute(attr)) {
+                return true;
+              }
+            }
+            return false;
+          }
         });
 
         // kick off initial focus in the menu on the first element

src/components/menu/menu.spec.js

@@ -72,23 +72,72 @@ describe('md-menu directive', function () {
     expect(getOpenMenuContainer().length).toBe(0);
   }));
 
-  it('closes on option click', function () {
-    expect(getOpenMenuContainer().length).toBe(0);
+  describe('closes with ng-click', function() {
+    it('closes on normal option click', function () {
+      expect(getOpenMenuContainer().length).toBe(0);
 
-    openMenu(setup());
+      openMenu(setup());
 
-    expect(something).toBeFalsy();
-    expect(getOpenMenuContainer().length).toBe(1);
+      expect(something).toBeFalsy();
+      expect(getOpenMenuContainer().length).toBe(1);
 
-    var btn = angular.element(getOpenMenuContainer()[0].querySelector('md-button'));
-        btn.triggerHandler({ type: 'click' });
+      var btn = getOpenMenuContainer()[0].querySelector('md-button');
+          btn.click();
 
-    waitForMenuClose();
+      waitForMenuClose();
+
+      expect(something).toBeTruthy();
+
+      expect(getOpenMenuContainer().length).toBe(0);
+    });
+
+    it('closes with data-ng-click', inject(function($rootScope, $compile) {
+      expect(getOpenMenuContainer().length).toBe(0);
+
+      var template = '' +
+        '<md-menu>' +
+        ' <button ng-click="$mdOpenMenu($event)">Hello World</button>' +
+        ' <md-menu-content>' +
+        '  <md-menu-item>' +
+        '    <md-button data-ng-click="doSomething($event)"></md-button>' +
+        '  </md-menu-item>' +
+        ' </md-menu-content>' +
+        '</md-menu>';
 
-    expect(something).toBeTruthy();
+      openMenu($compile(template)($rootScope));
+      expect(getOpenMenuContainer().length).toBe(1);
+
+      var btn = getOpenMenuContainer()[0].querySelector('md-button');
+          btn.click();
+
+      waitForMenuClose();
+
+      expect(getOpenMenuContainer().length).toBe(0);
+    }));
+
+    it('closes with x-ng-click', inject(function($rootScope, $compile) {
+      expect(getOpenMenuContainer().length).toBe(0);
+
+      var template = '' +
+        '<md-menu>' +
+        ' <button ng-click="$mdOpenMenu($event)">Hello World</button>' +
+        ' <md-menu-content>' +
+        '  <md-menu-item>' +
+        '    <md-button x-ng-click="doSomething($event)"></md-button>' +
+        '  </md-menu-item>' +
+        ' </md-menu-content>' +
+        '</md-menu>';
+
+      openMenu($compile(template)($rootScope));
+      expect(getOpenMenuContainer().length).toBe(1);
+
+      var btn = getOpenMenuContainer()[0].querySelector('md-button');
+          btn.click();
+
+      waitForMenuClose();
 
-    // FIXME - why is the menu not auto-closing ?
-    //expect(getOpenMenuContainer().length).toBe(0);
+      expect(getOpenMenuContainer().length).toBe(0);
+    }));
   });
 
   // ********************************************