MD Bookmarks: Fix issue where keyboard shortcuts could fire incorrectly

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
@@ skipping 47 matching lines @@
         var mods = this.mods_;
         return ['altKey', 'ctrlKey', 'metaKey', 'shiftKey'].every(function(k) {
           return e[k] == !!mods[k];
         });
       }
       return false;
     }
   };
 
   /**
+   * A list of keyboard shortcuts which all perform one command.
+   * @param {string} shortcuts Text-based representation of one or more keyboard
+   *     shortcuts, separated by spaces.
+   * @constructor
+   */
+  function KeyboardShortcutList(shortcuts) {
+    this.shortcuts_ = shortcuts.split(/\s+/).map(function(shortcut) {
+      return new KeyboardShortcut(shortcut);
+    });
+  }
+
+  KeyboardShortcutList.prototype = {
+    /**
+     * Returns true if any of the keyboard shortcuts in the list matches a
+     * keyboard event.
+     * @param {!Event} e
+     * @return {boolean}
+     */
+    matchesEvent: function(e) {
+      return this.shortcuts_.some(function(keyboardShortcut) {
+        return keyboardShortcut.matchesEvent(e);
+      });
+    },
+  };
+
+  /**
    * Creates a new command element.
    * @constructor
    * @extends {HTMLElement}
    */
   var Command = cr.ui.define('command');
 
   Command.prototype = {
     __proto__: HTMLElement.prototype,
 
     /**
@@ skipping 50 matching lines @@
      *
      * @type {string}
      */
     shortcut_: '',
     get shortcut() {
       return this.shortcut_;
     },
     set shortcut(shortcut) {
       var oldShortcut = this.shortcut_;
       if (shortcut !== oldShortcut) {
-        this.keyboardShortcuts_ = shortcut.split(/\s+/).map(function(shortcut) {
-          return new KeyboardShortcut(shortcut);
-        });
+        this.keyboardShortcuts_ = new KeyboardShortcutList(shortcut);
 
         // Set this after the keyboardShortcuts_ since that might throw.
         this.shortcut_ = shortcut;
         cr.dispatchPropertyChange(
             this, 'shortcut', this.shortcut_, oldShortcut);
       }
     },
 
     /**
      * Whether the event object matches the shortcut for this command.
      * @param {!Event} e The key event object.
      * @return {boolean} Whether it matched or not.
      */
     matchesEvent: function(e) {
       if (!this.keyboardShortcuts_)
         return false;
-
-      return this.keyboardShortcuts_.some(function(keyboardShortcut) {
-        return keyboardShortcut.matchesEvent(e);
-      });
+      return this.keyboardShortcuts_.matchesEvent(e);
     },
   };
 
   /**
    * The label of the command.
    */
   cr.defineProperty(Command, 'label', cr.PropertyKind.ATTR);
 
   /**
    * Whether the command is disabled or not.
@@ skipping 145 matching lines @@
       return this.canExecute_;
     },
     set canExecute(canExecute) {
       this.canExecute_ = !!canExecute;
       this.stopPropagation();
       this.preventDefault();
     }
   };
 
   // Export
-  return {Command: Command, CanExecuteEvent: CanExecuteEvent};
+  return {
+    Command: Command,
+    CanExecuteEvent: CanExecuteEvent,
+    KeyboardShortcutList: KeyboardShortcutList,
+  };
 });