Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Unified Diff: ui/login/account_picker/user_pod_row.js

Issue 2104103002: Convert Event#keyIdentifier (deprecated) to Event#key (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a few more stragglers Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/login/account_picker/user_pod_row.js
diff --git a/ui/login/account_picker/user_pod_row.js b/ui/login/account_picker/user_pod_row.js
index 0f854e0ba07a820dc14601dd4c059926d1345f2e..54717d6f73d774819ae2417a66d44a377f19db6e 100644
--- a/ui/login/account_picker/user_pod_row.js
+++ b/ui/login/account_picker/user_pod_row.js
@@ -475,7 +475,7 @@ cr.define('login', function() {
* @private
*/
handleKeyDown_: function(e) {
- if (!this.actionHandler_ || e.keyIdentifier != 'Enter')
+ if (!this.actionHandler_ || e.key != 'Enter')
return;
this.actionHandler_(e);
stopEventPropagation(e);
@@ -1438,15 +1438,15 @@ cr.define('login', function() {
handleActionAreaButtonKeyDown_: function(e) {
if (this.disabled)
return;
- switch (e.keyIdentifier) {
+ switch (e.key) {
case 'Enter':
- case 'U+0020': // Space
+ case ' ':
if (this.parentNode.focusedPod_ && !this.isActionBoxMenuActive)
this.isActionBoxMenuActive = true;
e.stopPropagation();
break;
- case 'Up':
- case 'Down':
+ case 'ArrowUp':
+ case 'ArrowDown':
if (this.isActionBoxMenuActive) {
this.actionBoxMenuRemoveElement.tabIndex =
UserPodTabOrder.POD_MENU_ITEM;
@@ -1457,13 +1457,13 @@ cr.define('login', function() {
// Ignore these two, so ChromeVox hotkeys don't close the menu before
// they can navigate through it.
case 'Shift':
- case 'Win':
+ case 'Meta':
break;
- case 'U+001B': // Esc
+ case 'Escape':
this.isActionBoxMenuActive = false;
e.stopPropagation();
break;
- case 'U+0009': // Tab
+ case 'Tab':
if (!this.parentNode.alwaysFocusSinglePod)
this.parentNode.focusPod();
default:
@@ -1480,7 +1480,7 @@ cr.define('login', function() {
if (this.disabled)
return;
- if (e.keyIdentifier != 'U+0009' /* TAB */) {
+ if (e.key != 'Tab') {
this.handleActionAreaButtonKeyDown_(e);
return;
}
@@ -1715,7 +1715,7 @@ cr.define('login', function() {
// Only handle pressing 'Enter' or 'Space', and let all other events
// bubble to the action box menu.
- if (e.keyIdentifier == 'Enter' || e.keyIdentifier == 'U+0020') {
+ if (e.key == 'Enter' || e.key == ' ') {
this.isActionBoxMenuActive = false;
this.removeUser(this.user);
e.stopPropagation();
@@ -1731,7 +1731,7 @@ cr.define('login', function() {
handleRemoveCommandKeyDown_: function(e) {
if (this.disabled)
return;
- switch (e.keyIdentifier) {
+ switch (e.key) {
case 'Enter':
if (this.user.legacySupervisedUser || this.user.isDesktopUser) {
// Prevent default so that we don't trigger a 'click' event on the
@@ -1743,16 +1743,16 @@ cr.define('login', function() {
}
e.stopPropagation();
break;
- case 'Up':
- case 'Down':
+ case 'ArrowUp':
+ case 'ArrowDown':
e.stopPropagation();
break;
// Ignore these two, so ChromeVox hotkeys don't close the menu before
// they can navigate through it.
case 'Shift':
- case 'Win':
+ case 'Meta':
break;
- case 'U+001B': // Esc
+ case 'Escape':
this.actionBoxAreaElement.focus();
this.isActionBoxMenuActive = false;
e.stopPropagation();
@@ -1818,9 +1818,9 @@ cr.define('login', function() {
handlePodKeyDown_: function(e) {
if (!this.isAuthTypeUserClick || this.disabled)
return;
- switch (e.keyIdentifier) {
+ switch (e.key) {
case 'Enter':
- case 'U+0020': // Space
+ case ' ':
if (this.parentNode.isFocused(this))
this.parentNode.setActivatedPod(this);
break;
@@ -1920,7 +1920,7 @@ cr.define('login', function() {
this.classList.add('public-account');
this.nameElement.addEventListener('keydown', (function(e) {
- if (e.keyIdentifier == 'Enter') {
+ if (e.key == 'Enter') {
this.parentNode.setActivatedPod(this, e);
// Stop this keydown event from bubbling up to PodRow handler.
e.stopPropagation();
@@ -3350,8 +3350,8 @@ cr.define('login', function() {
if (this.disabled)
return;
var editing = e.target.tagName == 'INPUT' && e.target.value;
- switch (e.keyIdentifier) {
- case 'Left':
+ switch (e.key) {
+ case 'ArrowLeft':
if (!editing) {
if (this.focusedPod_ && this.focusedPod_.previousElementSibling)
this.focusPod(this.focusedPod_.previousElementSibling);
@@ -3361,7 +3361,7 @@ cr.define('login', function() {
e.stopPropagation();
}
break;
- case 'Right':
+ case 'ArrowRight':
if (!editing) {
if (this.focusedPod_ && this.focusedPod_.nextElementSibling)
this.focusPod(this.focusedPod_.nextElementSibling);
@@ -3383,7 +3383,7 @@ cr.define('login', function() {
}
}
break;
- case 'U+001B': // Esc
+ case 'Escape':
if (!this.alwaysFocusSinglePod)
this.focusPod();
break;

Powered by Google App Engine
This is Rietveld 408576698