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

Unified Diff: third_party/WebKit/Source/devtools/front_end/ui/ShortcutRegistry.js

Issue 2466123002: DevTools: reformat front-end code to match chromium style. (Closed)
Patch Set: all done Created 4 years, 1 month 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: third_party/WebKit/Source/devtools/front_end/ui/ShortcutRegistry.js
diff --git a/third_party/WebKit/Source/devtools/front_end/ui/ShortcutRegistry.js b/third_party/WebKit/Source/devtools/front_end/ui/ShortcutRegistry.js
index b517dc510f3162d0c7809e275c83479a0f6d4434..162097e557e88c9233197b498ed37850ff3a31bd 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/ShortcutRegistry.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/ShortcutRegistry.js
@@ -1,221 +1,204 @@
// Copyright 2014 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.
-
/**
- * @constructor
- * @param {!WebInspector.ActionRegistry} actionRegistry
- * @param {!Document} document
+ * @unrestricted
*/
-WebInspector.ShortcutRegistry = function(actionRegistry, document)
-{
+WebInspector.ShortcutRegistry = class {
+ /**
+ * @param {!WebInspector.ActionRegistry} actionRegistry
+ * @param {!Document} document
+ */
+ constructor(actionRegistry, document) {
this._actionRegistry = actionRegistry;
/** @type {!Multimap.<string, string>} */
this._defaultKeyToActions = new Multimap();
/** @type {!Multimap.<string, !WebInspector.KeyboardShortcut.Descriptor>} */
this._defaultActionToShortcut = new Multimap();
this._registerBindings(document);
-};
+ }
+
+ /**
+ * @param {number} key
+ * @return {!Array.<!WebInspector.Action>}
+ */
+ _applicableActions(key) {
+ return this._actionRegistry.applicableActions(this._defaultActionsForKey(key).valuesArray(), WebInspector.context);
+ }
+
+ /**
+ * @param {number} key
+ * @return {!Set.<string>}
+ */
+ _defaultActionsForKey(key) {
+ return this._defaultKeyToActions.get(String(key));
+ }
+
+ /**
+ * @param {string} actionId
+ * @return {!Array.<!WebInspector.KeyboardShortcut.Descriptor>}
+ */
+ shortcutDescriptorsForAction(actionId) {
+ return this._defaultActionToShortcut.get(actionId).valuesArray();
+ }
+
+ /**
+ * @param {!Array.<string>} actionIds
+ * @return {!Array.<number>}
+ */
+ keysForActions(actionIds) {
+ var result = [];
+ for (var i = 0; i < actionIds.length; ++i) {
+ var descriptors = this.shortcutDescriptorsForAction(actionIds[i]);
+ for (var j = 0; j < descriptors.length; ++j)
+ result.push(descriptors[j].key);
+ }
+ return result;
+ }
+
+ /**
+ * @param {string} actionId
+ * @return {string|undefined}
+ */
+ shortcutTitleForAction(actionId) {
+ var descriptors = this.shortcutDescriptorsForAction(actionId);
+ if (descriptors.length)
+ return descriptors[0].name;
+ }
+
+ /**
+ * @param {!KeyboardEvent} event
+ */
+ handleShortcut(event) {
+ this.handleKey(WebInspector.KeyboardShortcut.makeKeyFromEvent(event), event.key, event);
+ }
+
+ /**
+ * @param {number} key
+ * @param {string} domKey
+ * @param {!KeyboardEvent=} event
+ */
+ handleKey(key, domKey, event) {
+ var keyModifiers = key >> 8;
+ var actions = this._applicableActions(key);
+ if (!actions.length)
+ return;
+ if (WebInspector.Dialog.hasInstance()) {
+ if (event && !isPossiblyInputKey())
+ event.consume(true);
+ return;
+ }
-WebInspector.ShortcutRegistry.prototype = {
- /**
- * @param {number} key
- * @return {!Array.<!WebInspector.Action>}
- */
- _applicableActions: function(key)
- {
- return this._actionRegistry.applicableActions(this._defaultActionsForKey(key).valuesArray(), WebInspector.context);
- },
+ if (!isPossiblyInputKey()) {
+ if (event)
+ event.consume(true);
+ processNextAction.call(this, false);
+ } else {
+ this._pendingActionTimer = setTimeout(processNextAction.bind(this, false), 0);
+ }
/**
- * @param {number} key
- * @return {!Set.<string>}
+ * @param {boolean} handled
+ * @this {WebInspector.ShortcutRegistry}
*/
- _defaultActionsForKey: function(key)
- {
- return this._defaultKeyToActions.get(String(key));
- },
+ function processNextAction(handled) {
+ delete this._pendingActionTimer;
+ var action = actions.shift();
+ if (!action || handled)
+ return;
- /**
- * @param {string} actionId
- * @return {!Array.<!WebInspector.KeyboardShortcut.Descriptor>}
- */
- shortcutDescriptorsForAction: function(actionId)
- {
- return this._defaultActionToShortcut.get(actionId).valuesArray();
- },
+ action.execute().then(processNextAction.bind(this));
+ }
/**
- * @param {!Array.<string>} actionIds
- * @return {!Array.<number>}
+ * @return {boolean}
*/
- keysForActions: function(actionIds)
- {
- var result = [];
- for (var i = 0; i < actionIds.length; ++i) {
- var descriptors = this.shortcutDescriptorsForAction(actionIds[i]);
- for (var j = 0; j < descriptors.length; ++j)
- result.push(descriptors[j].key);
- }
- return result;
- },
+ function isPossiblyInputKey() {
+ if (!event || !WebInspector.isEditing() || /^F\d+|Control|Shift|Alt|Meta|Escape|Win|U\+001B$/.test(domKey))
+ return false;
- /**
- * @param {string} actionId
- * @return {string|undefined}
- */
- shortcutTitleForAction: function(actionId)
- {
- var descriptors = this.shortcutDescriptorsForAction(actionId);
- if (descriptors.length)
- return descriptors[0].name;
- },
+ if (!keyModifiers)
+ return true;
- /**
- * @param {!KeyboardEvent} event
- */
- handleShortcut: function(event)
- {
- this.handleKey(WebInspector.KeyboardShortcut.makeKeyFromEvent(event), event.key, event);
- },
+ var modifiers = WebInspector.KeyboardShortcut.Modifiers;
+ if ((keyModifiers & (modifiers.Ctrl | modifiers.Alt)) === (modifiers.Ctrl | modifiers.Alt))
+ return WebInspector.isWin();
+
+ return !hasModifier(modifiers.Ctrl) && !hasModifier(modifiers.Alt) && !hasModifier(modifiers.Meta);
+ }
/**
- * @param {number} key
- * @param {string} domKey
- * @param {!KeyboardEvent=} event
+ * @param {number} mod
+ * @return {boolean}
*/
- handleKey: function(key, domKey, event)
- {
- var keyModifiers = key >> 8;
- var actions = this._applicableActions(key);
- if (!actions.length)
- return;
- if (WebInspector.Dialog.hasInstance()) {
- if (event && !isPossiblyInputKey())
- event.consume(true);
- return;
- }
-
- if (!isPossiblyInputKey()) {
- if (event)
- event.consume(true);
- processNextAction.call(this, false);
- } else {
- this._pendingActionTimer = setTimeout(processNextAction.bind(this, false), 0);
- }
-
- /**
- * @param {boolean} handled
- * @this {WebInspector.ShortcutRegistry}
- */
- function processNextAction(handled)
- {
- delete this._pendingActionTimer;
- var action = actions.shift();
- if (!action || handled)
- return;
-
- action.execute().then(processNextAction.bind(this));
- }
-
- /**
- * @return {boolean}
- */
- function isPossiblyInputKey()
- {
- if (!event || !WebInspector.isEditing() || /^F\d+|Control|Shift|Alt|Meta|Escape|Win|U\+001B$/.test(domKey))
- return false;
-
- if (!keyModifiers)
- return true;
-
- var modifiers = WebInspector.KeyboardShortcut.Modifiers;
- if ((keyModifiers & (modifiers.Ctrl | modifiers.Alt)) === (modifiers.Ctrl | modifiers.Alt))
- return WebInspector.isWin();
-
- return !hasModifier(modifiers.Ctrl) && !hasModifier(modifiers.Alt) && !hasModifier(modifiers.Meta);
- }
-
- /**
- * @param {number} mod
- * @return {boolean}
- */
- function hasModifier(mod)
- {
- return !!(keyModifiers & mod);
- }
- },
+ function hasModifier(mod) {
+ return !!(keyModifiers & mod);
+ }
+ }
+
+ /**
+ * @param {string} actionId
+ * @param {string} shortcut
+ */
+ registerShortcut(actionId, shortcut) {
+ var descriptor = WebInspector.KeyboardShortcut.makeDescriptorFromBindingShortcut(shortcut);
+ if (!descriptor)
+ return;
+ this._defaultActionToShortcut.set(actionId, descriptor);
+ this._defaultKeyToActions.set(String(descriptor.key), actionId);
+ }
+
+ dismissPendingShortcutAction() {
+ if (this._pendingActionTimer) {
+ clearTimeout(this._pendingActionTimer);
+ delete this._pendingActionTimer;
+ }
+ }
+
+ /**
+ * @param {!Document} document
+ */
+ _registerBindings(document) {
+ document.addEventListener('input', this.dismissPendingShortcutAction.bind(this), true);
+ var extensions = self.runtime.extensions(WebInspector.ActionDelegate);
+ extensions.forEach(registerExtension, this);
/**
- * @param {string} actionId
- * @param {string} shortcut
+ * @param {!Runtime.Extension} extension
+ * @this {WebInspector.ShortcutRegistry}
*/
- registerShortcut: function(actionId, shortcut)
- {
- var descriptor = WebInspector.KeyboardShortcut.makeDescriptorFromBindingShortcut(shortcut);
- if (!descriptor)
- return;
- this._defaultActionToShortcut.set(actionId, descriptor);
- this._defaultKeyToActions.set(String(descriptor.key), actionId);
- },
-
- dismissPendingShortcutAction: function()
- {
- if (this._pendingActionTimer) {
- clearTimeout(this._pendingActionTimer);
- delete this._pendingActionTimer;
- }
- },
+ function registerExtension(extension) {
+ var descriptor = extension.descriptor();
+ var bindings = descriptor['bindings'];
+ for (var i = 0; bindings && i < bindings.length; ++i) {
+ if (!platformMatches(bindings[i].platform))
+ continue;
+ var shortcuts = bindings[i]['shortcut'].split(/\s+/);
+ shortcuts.forEach(this.registerShortcut.bind(this, descriptor['actionId']));
+ }
+ }
/**
- * @param {!Document} document
+ * @param {string=} platformsString
+ * @return {boolean}
*/
- _registerBindings: function(document)
- {
- document.addEventListener("input", this.dismissPendingShortcutAction.bind(this), true);
- var extensions = self.runtime.extensions(WebInspector.ActionDelegate);
- extensions.forEach(registerExtension, this);
-
- /**
- * @param {!Runtime.Extension} extension
- * @this {WebInspector.ShortcutRegistry}
- */
- function registerExtension(extension)
- {
- var descriptor = extension.descriptor();
- var bindings = descriptor["bindings"];
- for (var i = 0; bindings && i < bindings.length; ++i) {
- if (!platformMatches(bindings[i].platform))
- continue;
- var shortcuts = bindings[i]["shortcut"].split(/\s+/);
- shortcuts.forEach(this.registerShortcut.bind(this, descriptor["actionId"]));
- }
- }
-
- /**
- * @param {string=} platformsString
- * @return {boolean}
- */
- function platformMatches(platformsString)
- {
- if (!platformsString)
- return true;
- var platforms = platformsString.split(",");
- var isMatch = false;
- var currentPlatform = WebInspector.platform();
- for (var i = 0; !isMatch && i < platforms.length; ++i)
- isMatch = platforms[i] === currentPlatform;
- return isMatch;
- }
+ function platformMatches(platformsString) {
+ if (!platformsString)
+ return true;
+ var platforms = platformsString.split(',');
+ var isMatch = false;
+ var currentPlatform = WebInspector.platform();
+ for (var i = 0; !isMatch && i < platforms.length; ++i)
+ isMatch = platforms[i] === currentPlatform;
+ return isMatch;
}
+ }
};
/**
- * @constructor
+ * @unrestricted
*/
-WebInspector.ShortcutRegistry.ForwardedShortcut = function()
-{
-};
+WebInspector.ShortcutRegistry.ForwardedShortcut = class {};
WebInspector.ShortcutRegistry.ForwardedShortcut.instance = new WebInspector.ShortcutRegistry.ForwardedShortcut();

Powered by Google App Engine
This is Rietveld 408576698