Skip to content
This repository has been archived by the owner on May 29, 2019. It is now read-only.

Don't stop ESC propagation unless dropdown is open #3179

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion src/datepicker/datepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,9 @@ function ($compile, $parse, $document, $position, dateFilter, dateParser, datepi
scope.keydown = function(evt) {
if (evt.which === 27) {
evt.preventDefault();
evt.stopPropagation();
if (scope.isOpen) {
evt.stopPropagation();
}
scope.close();
} else if (evt.which === 40 && !scope.isOpen) {
scope.isOpen = true;
Expand Down
21 changes: 21 additions & 0 deletions src/datepicker/test/datepicker.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1248,6 +1248,27 @@ describe('datepicker directive', function () {
expect(dropdownEl).toBeHidden();
expect(document.activeElement.tagName).toBe('INPUT');
});

it('stops the ESC key from propagating if the dropdown is open, but not when closed', function() {
expect(dropdownEl).not.toBeHidden();

dropdownEl.find('button').eq(0).focus();
expect(document.activeElement.tagName).toBe('BUTTON');

var documentKey = -1;
var getKey = function(evt) { documentKey = evt.which; };
$document.bind('keydown', getKey);

triggerKeyDown(inputEl, 'esc');
$rootScope.$digest();
expect(dropdownEl).toBeHidden();
expect(documentKey).toBe(-1);

triggerKeyDown(inputEl, 'esc');
expect(documentKey).toBe(27);

$document.unbind('keydown', getKey);
});
});
});

Expand Down