MD Settings: ignore modified key events in the profile avatar grid

ui/webui/resources/cr_elements/cr_profile_avatar_selector/cr_profile_avatar_selector_grid.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview 'cr-profile-avatar-selector-grid' is an accessible control for
  * profile avatar icons that allows keyboard navigation with all arrow keys.
  */
 
 Polymer({
   is: 'cr-profile-avatar-selector-grid',
 
   behaviors: [
     Polymer.IronMenubarBehavior,
   ],
 
+  properties: {
+    ignoreModifiedKeyEvents: {
+      type: Boolean,
+      value: false,
+    },
+  },
+
+  /**
+   * Handler that is called when left arrow key is pressed. Overrides
+   * IronMenubarBehaviorImpl#_onLeftKey.
+   * @param {CustomEvent} event

[michaelpg, 2016/12/19 10:02:46]

! (since IronMenubarBehaviorImpl assumes it's non-null)

[Dan Beam, 2016/12/20 07:07:57]

Done.

+   * @private
+   */
+  _onLeftKey: function(event) {
+    if (this.ignoreModifiedKeyEvents && this.hasKeyModifiers_(event))
+      return;
+    Polymer.IronMenubarBehaviorImpl._onLeftKey.call(this, event);
+  },
+
+  /**
+   * Handler that is called when right arrow key is pressed. Overrides
+   * IronMenubarBehaviorImpl#_onLeftKey.

[michaelpg, 2016/12/19 10:02:46]

onRightKey

[Dan Beam, 2016/12/20 07:07:57]

Done.

+   * @param {CustomEvent} event

[michaelpg, 2016/12/19 10:02:46]

!

[Dan Beam, 2016/12/20 07:07:57]

Done.

+   * @private
+   */
+  _onRightKey: function(event) {
+    if (this.ignoreModifiedKeyEvents && this.hasKeyModifiers_(event))
+      return;
+    Polymer.IronMenubarBehaviorImpl._onRightKey.call(this, event);
+  },
+
   /**
    * Handler that is called when the up arrow key is pressed.
    * @param {CustomEvent} event A key combination event.
    * @private
    */
   _onUpKey: function(event) {
     this.moveFocusRow_(-1);
     event.detail.keyboardEvent.preventDefault();
   },
 
@@ skipping 10 matching lines @@
   /**
    * Handler that is called when the esc key is pressed.
    * @param {CustomEvent} event A key combination event.
    * @private
    */
   _onEscKey: function(event) {
     // Override the original behavior by doing nothing.
   },
 
   /**
+   * @param {!CustomEvent} event
+   * @return {boolean} Whether the key event has modifier keys pressed.
+   */
+  hasKeyModifiers_: function(event) {
+    var keyEv = /** @type {!KeyboardEvent} */(event.detail.keyboardEvent);
+    return keyEv.altKey || keyEv.ctrlKey || keyEv.metaKey || keyEv.shiftKey;

[michaelpg, 2016/12/19 10:02:45]

maybe it's time for a function in util.js?
https://cs.chromium.org/search/?q=%5Bctrlaltmetashift%5D%7B3,5%7Dkey.*(%5C%7C...

[Dan Beam, 2016/12/20 07:07:56]

Done.

+  },
+
+  /**
    * Focuses an item on the same column as the currently focused item and on a
    * row below or above the focus row by the given offset. Focus wraps if
    * necessary.
    * @param {number} offset
    * @private
    */
   moveFocusRow_: function(offset) {
     var length = this.items.length;
     var style = getComputedStyle(this);
     var avatarSpacing =
         parseInt(style.getPropertyValue('--avatar-spacing'), 10);
     var avatarSize = parseInt(style.getPropertyValue('--avatar-size'), 10);
     var rowSize = Math.floor(this.clientWidth / (avatarSpacing + avatarSize));
     var rows = Math.ceil(length / rowSize);
     var gridSize = rows * rowSize;
     var focusIndex = this.indexOf(this.focusedItem);
     for (var i = offset; Math.abs(i) <= rows; i += offset) {
       var item = this.items[(focusIndex + i * rowSize + gridSize) % gridSize];
       if (!item)
         continue;
       this._setFocusedItem(item);
 
       assert(Polymer.dom(item).getOwnerRoot().activeElement == item);
       return;
     }
   }
 });