fix(menu): make menu close with ui-sref and ng-href

closes #3397
angular · Jul 12, 2015 · dc01149 · dc01149
1 parent 0d6e5ac
commit dc01149
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 51 deletions.
diff --git a/src/components/menu/menu-interim-element.js b/src/components/menu/menu-interim-element.js
@@ -150,7 +150,7 @@ function MenuProvider($$interimElementProvider) {
           // there is an ng-click and that the ng-click is not disabled
           do {
             if (target == opts.menuContentEl[0]) return;
-            if (hasAnyAttribute(target, ['ng-click', 'data-ng-click', 'x-ng-click'])) {
+            if (hasAnyAttribute(target, ['ng-click', 'ng-href', 'ui-sref'])) {
               if (!target.hasAttribute('disabled')) {
                 close();
               }
@@ -167,8 +167,11 @@ function MenuProvider($$interimElementProvider) {
           function hasAnyAttribute(target, attrs) {
             if (!target) return false;
             for (var i = 0, attr; attr = attrs[i]; ++i) {
-              if (target.hasAttribute(attr)) {
-                return true;
+              var altForms = [attr, 'data-' + attr, 'x-' + attr];
+              for (var j = 0, rawAttr; rawAttr = altForms[j]; ++j) {
+                if (target.hasAttribute(rawAttr)) {
+                  return true;
+                }
               }
             }
             return false;

diff --git a/src/components/menu/menu.spec.js b/src/components/menu/menu.spec.js
@@ -72,7 +72,7 @@ describe('md-menu directive', function () {
     expect(getOpenMenuContainer().length).toBe(0);
   }));
 
-  describe('closes with ng-click', function() {
+  ddescribe('closes with -', function() {
     it('closes on normal option click', function () {
       expect(getOpenMenuContainer().length).toBe(0);
 
@@ -91,53 +91,41 @@ describe('md-menu directive', function () {
       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>';
-
-      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();
-
-      expect(getOpenMenuContainer().length).toBe(0);
-    }));
+    itClosesWithAttributes([
+      'data-ng-click', 'x-ng-click',
+      'ui-sref','data-ui-sref', 'x-ui-sref',
+      'ng-href', 'data-ng-href', 'x-ng-href'
+    ]);
+
+    function itClosesWithAttributes(types) {
+      for (var i = 0; i < types.length; ++i) {
+        it('closes with ' + types[i], testAttribute(types[i]));
+      }
+
+      function testAttribute(attr) {
+        return inject(function($rootScope, $compile) {
+          var template = '' +
+            '<md-menu>' +
+            ' <button ng-click="$mdOpenMenu($event)">Hello World</button>' +
+            ' <md-menu-content>' +
+            '  <md-menu-item>' +
+            '    <md-button ' + attr + '=""></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();
+
+          expect(getOpenMenuContainer().length).toBe(0);
+        });
+      }
+    }
   });
 
   // ********************************************