bug(ngAria): native controls fire a single click event

Author: Marcy Sutton

src/ngAria/aria.js

@@ -83,7 +83,8 @@ function $AriaProvider() {
     ariaMultiline: true,
     ariaValue: true,
     tabindex: true,
-    bindKeypress: true
+    bindKeypress: true,
+    keypressEls: ['DIV', 'LI']
   };
 
   /**
@@ -303,11 +304,20 @@ ngAriaModule.directive('ngShow', ['$aria', function($aria) {
     compile: function(elem, attr) {
       var fn = $parse(attr.ngClick, /* interceptorFn */ null, /* expensiveChecks */ true);
       return function(scope, elem, attr) {
+
+        function isNodeOneOf(elem, nodeTypeArray) {
+          for (var i=0; i < nodeTypeArray.length; i++) {
+            if (elem[0].nodeName === nodeTypeArray[i]) {
+              return true;
+            }
+          }
+        }
+
         if ($aria.config('tabindex') && !elem.attr('tabindex')) {
           elem.attr('tabindex', 0);
         }
 
-        if ($aria.config('bindKeypress') && !attr.ngKeypress) {
+        if ($aria.config('bindKeypress') && !attr.ngKeypress && isNodeOneOf(elem, $aria.config('keypressEls'))) {
           elem.on('keypress', function(event) {
             if (event.keyCode === 32 || event.keyCode === 13) {
               scope.$apply(callback);

test/ngAria/ariaSpec.js

@@ -496,6 +496,16 @@ describe('$aria', function() {
       expect(clickFn).toHaveBeenCalled();
     });
 
+    it('should a trigger click from the keyboard', function() {
+      scope.someAction = function() {};
+      compileInput('<li ng-click="someAction()" tabindex="0"></li>');
+      clickFn = spyOn(scope, 'someAction');
+
+      element.triggerHandler({type: 'keypress', keyCode: 32});
+
+      expect(clickFn).toHaveBeenCalled();
+    });
+
     it('should not override existing ng-keypress', function() {
       scope.someOtherAction = function() {};
       var keypressFn = spyOn(scope, 'someOtherAction');
@@ -526,6 +536,31 @@ describe('$aria', function() {
       element.triggerHandler({ type: 'keypress', keyCode: 13 });
       expect(element.text()).toBe('keypress13');
     });
+
+    it('should not bind keypress to non-div elements', function() {
+      compileInput('<button ng-click="event = $event">{{event.type}}{{event.keyCode}}</button>');
+      expect(element.text()).toBe('');
+      element.triggerHandler({ type: 'keypress', keyCode: 13 });
+      expect(element.text()).toBe('');
+    });
+  });
+
+  describe('actions for different configured elements', function() {
+    beforeEach(configAriaProvider({
+      keypressEls: ['DIV']
+    }));
+    beforeEach(injectScopeAndCompiler);
+
+    it('should not a trigger click from the keyboard', function() {
+      scope.someAction = function() {};
+      var clickFn = spyOn(scope, 'someAction');
+
+      element = $compile('<li ng-click="someAction()" tabindex="0"></li>')(scope);
+
+      element.triggerHandler({type: 'keypress', keyCode: 32});
+
+      expect(clickFn).not.toHaveBeenCalled();
+    });
   });
 
   describe('actions when bindKeypress set to false', function() {
@@ -538,7 +573,7 @@ describe('$aria', function() {
       scope.someAction = function() {};
       var clickFn = spyOn(scope, 'someAction');
 
-      element = $compile('<div ng-click="someAction()" tabindex="0">></div>')(scope);
+      element = $compile('<div ng-click="someAction()" tabindex="0"></div>')(scope);
 
       element.triggerHandler({type: 'keypress', keyCode: 32});