8000 fix(ngAria): change accessibility keypress event to use event.which if it is provided by andrewaustin · Pull Request #11340 · angular/angular.js · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

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

Closed
wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix(ngAria): change accessibility keypress event to use event.which i… 
…f it is provided

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.
  • Loading branch information
@andrewaustin
andrewaustin committed Mar 17, 2015
commit 6b835a6f5940c376ce2b52f897b99913cdd4ec6f
3 changes: 2 additions & 1 deletion src/ngAria/aria.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,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);
}

Expand Down
24 changes: 23 additions & 1 deletion test/ngAria/ariaSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ describe('$aria', function() {

var clickFn;

it('should a trigger click from the keyboard', function() {
it('should trigger click from the keyboard', function() {
scope.someAction = function() {};

var elements = $compile('<section>' +
Expand All @@ -608,6 +608,28 @@ describe('$aria', function() {
expect(clickFn).toHaveBeenCalledWith('li');
});

it('should trigger click in some browsers that provide event.which instead 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');
Expand Down
0