Convert Event#keyIdentifier (deprecated) to Event#key

ui/webui/resources/js/cr/ui/command.js

 // Copyright (c) 2012 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 A command is an abstraction of an action a user can do in the
  * UI.
  *
  * When the focus changes in the document for each command a canExecute event
  * is dispatched on the active element. By listening to this event you can
  * enable and disable the command by setting the event.canExecute property.
  *
  * When a command is executed a command event is dispatched on the active
  * element. Note that you should stop the propagation after you have handled the
  * command if there might be other command listeners higher up in the DOM tree.
  */
 
 cr.define('cr.ui', function() {
 
   /**
    * This is used to identify keyboard shortcuts.
    * @param {string} shortcut The text used to describe the keys for this
    *     keyboard shortcut.
    * @constructor
    */
   function KeyboardShortcut(shortcut) {
     var mods = {};
     var ident = '';
-    shortcut.split('-').forEach(function(part) {
+    shortcut.split('|').forEach(function(part) {
       var partLc = part.toLowerCase();
       switch (partLc) {
         case 'alt':
         case 'ctrl':
         case 'meta':
         case 'shift':
           mods[partLc + 'Key'] = true;
           break;
         default:
           if (ident)
             throw Error('Invalid shortcut');
           ident = part;
       }
     });
 
     this.ident_ = ident;
     this.mods_ = mods;
   }
 
   KeyboardShortcut.prototype = {
     /**
      * Whether the keyboard shortcut object matches a keyboard event.
      * @param {!Event} e The keyboard event object.
      * @return {boolean} Whether we found a match or not.
      */
     matchesEvent: function(e) {
-      if (e.keyIdentifier == this.ident_) {
+      if (e.key == this.ident_) {
         // All keyboard modifiers needs to match.
         var mods = this.mods_;
         return ['altKey', 'ctrlKey', 'metaKey', 'shiftKey'].every(function(k) {
           return e[k] == !!mods[k];
         });
       }
       return false;
     }
   };
 
@@ skipping 40 matching lines @@
      * command can be executed or not.
      * @param {Node=} opt_node Node for which to actuate command state.
      */
     canExecuteChange: function(opt_node) {
       dispatchCanExecuteEvent(this,
                               opt_node || this.ownerDocument.activeElement);
     },
 
     /**
      * The keyboard shortcut that triggers the command. This is a string
-     * consisting of a keyIdentifier (as reported by WebKit in keydown) as
-     * well as optional key modifiers joinded with a '-'.
+     * consisting of a key (as reported by WebKit in keydown) as
+     * well as optional key modifiers joinded with a '|'.
      *
      * Multiple keyboard shortcuts can be provided by separating them by
      * whitespace.
      *
      * For example:
      *   "F1"
-     *   "U+0008-Meta" for Apple command backspace.
-     *   "U+0041-Ctrl" for Control A
-     *   "U+007F U+0008-Meta" for Delete and Command Backspace
+     *   "Backspace|Meta" for Apple command backspace.
+     *   "a|Ctrl" for Control A
+     *   "Delete Backspace|Meta" for Delete and Command Backspace
      *
      * @type {string}
      */
     shortcut_: '',
     get shortcut() {
       return this.shortcut_;
     },
     set shortcut(shortcut) {
       var oldShortcut = this.shortcut_;
       if (shortcut !== oldShortcut) {
@@ skipping 183 matching lines @@
       this.preventDefault();
     }
   };
 
   // Export
   return {
     Command: Command,
     CanExecuteEvent: CanExecuteEvent
   };
 });