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

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

Issue 2054783002: ChromeVox access to login user pod menus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « ui/login/account_picker/user_pod_row.css ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6b23a93f9d9fcd3c22b8b9b024f179005d0cc5cf..acc43368b631135ab7cb094228711c863af02f0e 100644
--- a/ui/login/account_picker/user_pod_row.js
+++ b/ui/login/account_picker/user_pod_row.js
@@ -92,7 +92,7 @@ cr.define('login', function() {
// the pod itself.
POD_CUSTOM_ICON: 2, // Pod custom icon next to password input field.
HEADER_BAR: 3, // Buttons on the header bar (Shutdown, Add User).
- PAD_MENU_ITEM: 4 // User pad menu items (Remove this user).
+ POD_MENU_ITEM: 4 // User pad menu items (User info, Remove user).
};
/**
@@ -719,18 +719,21 @@ cr.define('login', function() {
this.actionBoxAreaElement.addEventListener('keydown',
this.handleActionAreaButtonKeyDown_.bind(this));
+ this.actionBoxMenuTitleElement.addEventListener('keydown',
+ this.handleMenuTitleElementKeyDown_.bind(this));
+ this.actionBoxMenuTitleElement.addEventListener('blur',
+ this.handleMenuTitleElementBlur_.bind(this));
+
this.actionBoxMenuRemoveElement.addEventListener('click',
this.handleRemoveCommandClick_.bind(this));
this.actionBoxMenuRemoveElement.addEventListener('keydown',
this.handleRemoveCommandKeyDown_.bind(this));
this.actionBoxMenuRemoveElement.addEventListener('blur',
this.handleRemoveCommandBlur_.bind(this));
- this.actionBoxRemoveUserWarningButtonElement.addEventListener(
- 'click',
+ this.actionBoxRemoveUserWarningButtonElement.addEventListener('click',
this.handleRemoveUserConfirmationClick_.bind(this));
- this.actionBoxRemoveUserWarningButtonElement.addEventListener(
- 'keydown',
- this.handleRemoveUserConfirmationKeyDown_.bind(this));
+ this.actionBoxRemoveUserWarningButtonElement.addEventListener('keydown',
+ this.handleRemoveUserConfirmationKeyDown_.bind(this));
var pinKeyboard = $('pin-keyboard');
// The pin keyboard is not present on the md user manager.
@@ -932,15 +935,23 @@ cr.define('login', function() {
/**
* Gets action box menu.
- * @type {!HTMLInputElement}
+ * @type {!HTMLDivElement}
Greg Levin 2016/06/09 13:44:45 No idea if these comment tags should be fixed like
*/
get actionBoxMenu() {
return this.querySelector('.action-box-menu');
},
/**
+ * Gets action box menu title (user name and email).
+ * @type {!HTMLDivElement}
+ */
+ get actionBoxMenuTitleElement() {
+ return this.querySelector('.action-box-menu-title');
+ },
+
+ /**
* Gets action box menu title, user name item.
- * @type {!HTMLInputElement}
+ * @type {!HTMLSpanElement}
*/
get actionBoxMenuTitleNameElement() {
return this.querySelector('.action-box-menu-title-name');
@@ -948,7 +959,7 @@ cr.define('login', function() {
/**
* Gets action box menu title, user email item.
- * @type {!HTMLInputElement}
+ * @type {!HTMLSpanElement}
*/
get actionBoxMenuTitleEmailElement() {
return this.querySelector('.action-box-menu-title-email');
@@ -1152,6 +1163,10 @@ cr.define('login', function() {
this.actionBoxAreaElement.classList.add('active');
+ // Invisible focus causes ChromeVox to read user name and email.
+ this.actionBoxMenuTitleElement.tabIndex = UserPodTabOrder.POD_MENU_ITEM;
+ this.actionBoxMenuTitleElement.focus();
Greg Levin 2016/06/09 13:44:45 I tried using aria-activedescendant to get CV to r
+
// If the user pod is on either edge of the screen, then the menu
// could be displayed partially ofscreen.
this.actionBoxMenu.classList.remove('left-edge-offset');
@@ -1393,11 +1408,16 @@ cr.define('login', function() {
case 'Down':
if (this.isActionBoxMenuActive) {
this.actionBoxMenuRemoveElement.tabIndex =
- UserPodTabOrder.PAD_MENU_ITEM;
+ UserPodTabOrder.POD_MENU_ITEM;
this.actionBoxMenuRemoveElement.focus();
}
e.stopPropagation();
break;
+ // Ignore these two, so ChromeVox hotkeys don't close the menu before
+ // they can navigate through it.
+ case 'Shift':
+ case 'Win':
+ break;
case 'U+001B': // Esc
this.isActionBoxMenuActive = false;
e.stopPropagation();
@@ -1412,6 +1432,45 @@ cr.define('login', function() {
},
/**
+ * Handles a keydown event on menu title.
+ * @param {Event} e KeyDown event.
+ */
+ handleMenuTitleElementKeyDown_: function(e) {
+ if (this.disabled)
+ return;
+
+ if (e.keyIdentifier != 'U+0009' /* TAB */) {
+ this.handleActionAreaButtonKeyDown_(e);
+ return;
+ }
+
+ if (e.shiftKey == false) {
+ if (this.actionBoxMenuRemoveElement.hidden) {
+ this.isActionBoxMenuActive = false;
+ } else {
+ this.actionBoxMenuRemoveElement.tabIndex =
+ UserPodTabOrder.POD_MENU_ITEM;
+ this.actionBoxMenuRemoveElement.focus();
+ e.preventDefault();
+ }
+ } else {
+ this.isActionBoxMenuActive = false;
+ this.focusInput();
+ e.preventDefault();
+ }
+ },
+
+ /**
+ * Handles a blur event on menu title.
+ * @param {Event} e Blur event.
+ */
+ handleMenuTitleElementBlur_: function(e) {
+ if (this.disabled)
+ return;
+ this.actionBoxMenuTitleElement.tabIndex = -1;
+ },
+
+ /**
* Handles a click event on remove user command.
* @param {Event} e Click event.
*/
@@ -1647,6 +1706,11 @@ cr.define('login', function() {
case 'Down':
e.stopPropagation();
break;
+ // Ignore these two, so ChromeVox hotkeys don't close the menu before
+ // they can navigate through it.
+ case 'Shift':
+ case 'Win':
+ break;
case 'U+001B': // Esc
this.actionBoxAreaElement.focus();
this.isActionBoxMenuActive = false;
« no previous file with comments | « ui/login/account_picker/user_pod_row.css ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698