fix(ngAria): change accessibility keypress event to use event.which if it is provided

andrewaustin · Narretz · commit 249f9b81cbad · 2015-04-20T22:59:05.000+02:00
In Firefox, keyboard events for printable characters (e.g. space) do not use event.keyCode. Use event.which if it is provided before falling back to event.keyCode. Closes angular#11340
diff --git a/src/ngAria/aria.js b/src/ngAria/aria.js
@@ -347,7 +347,8 @@ ngAriaModule.directive('ngShow', ['$aria', function($aria) {
 
         if ($aria.config('bindKeypress') && !attr.ngKeypress && !isNodeOneOf(elem, nodeBlackList)) {
           elem.on('keypress', function(event) {
-            if (event.keyCode === 32 || event.keyCode === 13) {
+            var keyCode = event.which || event.keyCode;
+            if (keyCode === 32 || keyCode === 13) {
               scope.$apply(callback);
             }
 
diff --git a/test/ngAria/ariaSpec.js b/test/ngAria/ariaSpec.js
@@ -598,7 +598,7 @@ describe('$aria', function() {
 
     var clickFn;
 
-    it('should a trigger click from the keyboard', function() {
+    it('should trigger a click from the keyboard', function() {
       scope.someAction = function() {};
 
       var elements = $compile('<section>' +
@@ -620,6 +620,28 @@ describe('$aria', function() {
       expect(clickFn).toHaveBeenCalledWith('li');
     });
 
+    it('should trigger a click in browsers that provide event.which instead of event.keyCode', function() {
+      scope.someAction = function() {};
+
+      var elements = $compile('<section>' +
+      '<div class="div-click" ng-click="someAction(\'div\')" tabindex="0"></div>' +
+      '<ul><li ng-click="someAction( \'li\')" tabindex="0"></li></ul>' +
+      '</section>')(scope);
+
+      scope.$digest();
+
+      clickFn = spyOn(scope, 'someAction');
+
+      var divElement = elements.find('div');
+      var liElement = elements.find('li');
+
+      divElement.triggerHandler({type: 'keypress', which: 32});
+      liElement.triggerHandler({type: 'keypress', which: 32});
+
+      expect(clickFn).toHaveBeenCalledWith('div');
+      expect(clickFn).toHaveBeenCalledWith('li');
+    });
+
     it('should not override existing ng-keypress', function() {
       scope.someOtherAction = function() {};
       var keypressFn = spyOn(scope, 'someOtherAction');

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,8 @@ ngAriaModule.directive('ngShow', ['$aria', function($aria) {`
`347`	`347`
`348`	`348`	`if ($aria.config('bindKeypress') && !attr.ngKeypress && !isNodeOneOf(elem, nodeBlackList)) {`
`349`	`349`	`elem.on('keypress', function(event) {`
`350`		`- if (event.keyCode === 32 \|\| event.keyCode === 13) {`
	`350`	`+ var keyCode = event.which \|\| event.keyCode;`
	`351`	`+ if (keyCode === 32 \|\| keyCode === 13) {`
`351`	`352`	`scope.$apply(callback);`
`352`	`353`	`}`
`353`	`354`