DevTools: Implement extensions-based shortcut bindings

Source/devtools/front_end/inspector.js

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 17 matching lines @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 var WebInspector = {
     _registerModules: function()
     {
         var configuration;
         if (WebInspector.isWorkerFrontend()) {
             configuration = ["sources", "timeline", "profiles", "console", "codemirror"];
         } else {
-            configuration = ["elements", "network", "sources", "timeline", "profiles", "resources", "audits", "console", "codemirror", "extensions", "sources-formatter-actions"];
+            configuration = ["core", "elements", "network", "sources", "timeline", "profiles", "resources", "audits", "console", "codemirror", "extensions", "settings", "sources-formatter-actions"];
             if (WebInspector.experimentsSettings.layersPanel.isEnabled())
                 configuration.push("layers");
         }
         WebInspector.moduleManager.registerModules(configuration);
     },
 
     _createGlobalStatusBarItems: function()
     {
         if (this.inspectElementModeController)
             this.inspectorView.appendToLeftToolbar(this.inspectElementModeController.toggleSearchButton.element);
@@ skipping 77 matching lines @@
      * @return {boolean}
      */
     isWorkerFrontend: function()
     {
         return !!WebInspector.queryParamsObject["dedicatedWorkerId"] ||
                 !!WebInspector.queryParamsObject["isSharedWorker"];
     },
 
     showConsole: function()
     {
-        if (this.consoleView.isShowing())
-            return;
         this.inspectorView.showViewInDrawer("console");
     },
 
     _resetErrorAndWarningCounts: function()
     {
         WebInspector.inspectorView.setErrorAndWarningCounts(0, 0);
     },
 
     _updateErrorAndWarningCounts: function()
     {
@@ skipping 208 matching lines @@
 
     new WebInspector.DebuggerScriptMapping(this.debuggerModel, this.workspace, this.networkWorkspaceProvider);
     this.liveEditSupport = new WebInspector.LiveEditSupport(this.workspace);
     new WebInspector.CSSStyleSheetMapping(this.cssModel, this.workspace, this.networkWorkspaceProvider);
     new WebInspector.PresentationConsoleMessageHelper(this.workspace);
 
     // Create settings before loading modules.
     WebInspector.settings.initializeBackendSettings();
 
     this._registerModules();
+    WebInspector.KeyboardShortcut.loadBindings();
 
     this.panels = {};
     WebInspector.inspectorView = new WebInspector.InspectorView();
     WebInspector.inspectorView.show(document.body);
     this._createGlobalStatusBarItems();
 
     this.addMainEventListeners(document);
 
     window.addEventListener("resize", this.windowResize.bind(this), true);
 
@@ skipping 207 matching lines @@
             event.consume(true);
             return;
         }
     }
 
     if (WebInspector.advancedSearchController.handleShortcut(event))
         return;
     if (WebInspector.inspectElementModeController && WebInspector.inspectElementModeController.handleShortcut(event))
         return;
 
-    switch (event.keyIdentifier) {
-        case "U+004F": // O key
-        case "U+0050": // P key
-            if (!event.shiftKey && !event.altKey && WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event)) {
-                WebInspector.showPanel("sources").showGoToSourceDialog();
-                event.consume(true);
-            }
-            break;
-        case "U+0052": // R key
-            if (WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event)) {
-                WebInspector.debuggerModel.skipAllPauses(true, true);
-                WebInspector.resourceTreeModel.reloadPage(event.shiftKey);
-                event.consume(true);
-            }
-            if (window.DEBUG && event.altKey) {
-                WebInspector.reload();
-                return;
-            }
-            break;
-        case "F5":
-            if (!WebInspector.isMac()) {
-                WebInspector.resourceTreeModel.reloadPage(event.ctrlKey || event.shiftKey);
-                event.consume(true);
-            }
-            break;
-    }
-
     var isValidZoomShortcut = WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event) &&
         !event.altKey &&
         !InspectorFrontendHost.isStub;
     if (isValidZoomShortcut && WebInspector.handleZoomEvent(event)) {
         event.consume(true);
         return;
     }
 
-    if (event.keyCode === WebInspector.KeyboardShortcut.Keys.F1.code ||
-        (event.keyCode === WebInspector.KeyboardShortcut.Keys.QuestionMark.code && event.shiftKey && (!WebInspector.isBeingEdited(event.target) || event.metaKey))) {
-        this.settingsController.showSettingsScreen(WebInspector.SettingsScreen.Tabs.General);
-        event.consume(true);
-        return;
-    }
-
-    var Esc = "U+001B";
-    var doNotOpenDrawerOnEsc = WebInspector.experimentsSettings.doNotOpenDrawerOnEsc.isEnabled();
-    if (event.keyIdentifier === Esc) {
-        if (this.inspectorView.drawerVisible())
-            this.inspectorView.closeDrawer();
-        else if (!doNotOpenDrawerOnEsc)
-            this.inspectorView.showDrawer();
-    }
-
-    if (event.keyCode === WebInspector.KeyboardShortcut.Keys.Tilde.code && event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey)
-        this.showConsole();
+    WebInspector.KeyboardShortcut.handleShortcut(event);
 }
 
 WebInspector.documentCanCopy = function(event)
 {
     if (WebInspector.inspectorView.currentPanel() && WebInspector.inspectorView.currentPanel().handleCopyEvent)
         event.preventDefault();
 }
 
 WebInspector.documentCopy = function(event)
 {
@@ skipping 189 matching lines @@
 
 WebInspector.addMainEventListeners = function(doc)
 {
     doc.addEventListener("keydown", this.postDocumentKeyDown.bind(this), false);
     doc.addEventListener("beforecopy", this.documentCanCopy.bind(this), true);
     doc.addEventListener("copy", this.documentCopy.bind(this), false);
     doc.addEventListener("contextmenu", this.contextMenuEventFired.bind(this), true);
     doc.addEventListener("click", this.documentClick.bind(this), false);
 }
 
+/**
+ * @constructor
+ * @implements {WebInspector.ActionDelegate}
+ */
+WebInspector.SkipAllPausesAndReloadActionDelegate = function()

[pfeldman, 2014/02/21 16:29:16]

This does not belong to the inspector.js

[apavlov, 2014/02/24 09:57:57]

I was unsure about these two, since they don't seem belong to ResourceTreeModel
either. What would be the best location to place these into?

+{
+}
+
+WebInspector.SkipAllPausesAndReloadActionDelegate.prototype = {
+    /**
+     * @param {!KeyboardEvent=} keyEvent
+     * @return {boolean}
+     */
+    handleAction: function(keyEvent)
+    {
+        WebInspector.debuggerModel.skipAllPauses(true, true);
+        WebInspector.resourceTreeModel.reloadPage(keyEvent && keyEvent.shiftKey);
+        return true;
+    }
+}
+
+/**
+ * @constructor
+ * @implements {WebInspector.ActionDelegate}
+ */
+WebInspector.DebugReloadActionDelegate = function()

[pfeldman, 2014/02/21 16:29:16]

ditto

[apavlov, 2014/03/17 13:40:59]

Agreed on leaving these here for now offline.

+{
+}
+
+WebInspector.DebugReloadActionDelegate.prototype = {
+    /**
+     * @param {!KeyboardEvent=} keyEvent
+     * @return {boolean}
+     */
+    handleAction: function(keyEvent)
+    {
+        if (window.DEBUG) {
+            WebInspector.reload();
+            return true;
+        }
+        return false;
+    }
+}
+
+
 window.DEBUG = true;