Changeset 147105 in webkit

Timestamp:

Mar 28, 2013 6:25:50 AM (11 years ago)

Author:

caseq@chromium.org

Message:

Web Inspector: factor out node search controller from inspector.js
​https://bugs.webkit.org/show_bug.cgi?id=112689

Reviewed by Pavel Feldman.

This just extracts the existing logic of toggling node search
from inspector.js into a class of its own, InspectElementModeController.
Drive-by: add CtrlOrMeta+Shift+C to help screen.

• English.lproj/localizedStrings.js:
• WebCore.gypi:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.vcxproj/WebCore.vcxproj:
• WebCore.vcxproj/WebCore.vcxproj.filters:
• inspector/compile-front-end.py:
• inspector/front-end/InspectElementModeController.js: Added.

(WebInspector.InspectElementModeController):
(WebInspector.InspectElementModeController.createShortcut):
(WebInspector.InspectElementModeController.prototype.enabled):
(WebInspector.InspectElementModeController.prototype.disable):
(WebInspector.InspectElementModeController.prototype.toggleSearch.callback):
(WebInspector.InspectElementModeController.prototype.toggleSearch):
(WebInspector.InspectElementModeController.prototype.handleShortcut):

• inspector/front-end/InspectorFrontendAPI.js:

(InspectorFrontendAPI.enterInspectElementMode):

• inspector/front-end/WebKit.qrc:
• inspector/front-end/inspector.html:
• inspector/front-end/inspector.js:

(WebInspector._createGlobalStatusBarItems):
(WebInspector._registerShortcuts):
(WebInspector.documentKeyDown):
(WebInspector._updateFocusedNode):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore.vcxproj/WebCore.vcxproj (modified) (1 diff)
• WebCore.vcxproj/WebCore.vcxproj.filters (modified) (1 diff)
• inspector/compile-front-end.py (modified) (1 diff)
• inspector/front-end/InspectElementModeController.js (added)
• inspector/front-end/InspectorFrontendAPI.js (modified) (1 diff)
• inspector/front-end/WebKit.qrc (modified) (1 diff)
• inspector/front-end/inspector.html (modified) (1 diff)
• inspector/front-end/inspector.js (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-22  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: factor out node search controller from inspector.js
+        https://bugs.webkit.org/show_bug.cgi?id=112689
+
+        Reviewed by Pavel Feldman.
+
+        This just extracts the existing logic of toggling node search
+        from inspector.js into a class of its own, InspectElementModeController.
+        Drive-by: add CtrlOrMeta+Shift+C to help screen.
+
+        * English.lproj/localizedStrings.js:
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * inspector/compile-front-end.py:
+        * inspector/front-end/InspectElementModeController.js: Added.
+        (WebInspector.InspectElementModeController):
+        (WebInspector.InspectElementModeController.createShortcut):
+        (WebInspector.InspectElementModeController.prototype.enabled):
+        (WebInspector.InspectElementModeController.prototype.disable):
+        (WebInspector.InspectElementModeController.prototype.toggleSearch.callback):
+        (WebInspector.InspectElementModeController.prototype.toggleSearch):
+        (WebInspector.InspectElementModeController.prototype.handleShortcut):
+        * inspector/front-end/InspectorFrontendAPI.js:
+        (InspectorFrontendAPI.enterInspectElementMode):
+        * inspector/front-end/WebKit.qrc:
+        * inspector/front-end/inspector.html:
+        * inspector/front-end/inspector.js:
+        (WebInspector._createGlobalStatusBarItems):
+        (WebInspector._registerShortcuts):
+        (WebInspector.documentKeyDown):
+        (WebInspector._updateFocusedNode):
+
 2013-03-28  Eugene Klyuchnikov  <eustas@chromium.org>
 

trunk/Source/WebCore/English.lproj/localizedStrings.js

@@ -918 +918 @@
 localizedStrings["Limit number of captured JS stack frames"] = "Limit number of captured JS stack frames";
 localizedStrings["Frames to capture"] = "Frames to capture";
+localizedStrings["Select node to inspect"] = "Select node to inspect";

trunk/Source/WebCore/WebCore.gypi

@@ -5061 +5061 @@
             'inspector/front-end/NetworkRequest.js',
             'inspector/front-end/NetworkUISourceCodeProvider.js',
+            'inspector/front-end/InspectElementModeController.js',
             'inspector/front-end/Object.js',
             'inspector/front-end/ObjectPopoverHelper.js',

trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -77707 +77707 @@
                                 </File>
                                 <File
+                                        RelativePath="..\inspector\front-end\InspectElementModeController.js"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\inspector\front-end\Object.js"
                                         >

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -13504 +13504 @@
     <None Include="..\inspector\front-end\NetworkRequest.js" />
     <None Include="..\inspector\front-end\NetworkUISourceCodeProvider.js" />
+    <None Include="..\inspector\front-end\InspectElementModeController.js" />
     <None Include="..\inspector\front-end\Object.js" />
     <None Include="..\inspector\front-end\ObjectPopoverHelper.js" />

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

@@ -14876 +14876 @@
       <Filter>inspector\front-end</Filter>
     </None>
+    <None Include="..\inspector\front-end\InspectElementModeController.js">
+      <Filter>inspector\front-end</Filter>
+    </None>
     <None Include="..\inspector\front-end\Object.js">
       <Filter>inspector\front-end</Filter>

trunk/Source/WebCore/inspector/compile-front-end.py

@@ -185 +185 @@
             "ImageView.js",
             "NativeBreakpointsSidebarPane.js",
+            "InspectElementModeController.js",
             "ObjectPopoverHelper.js",
             "ObjectPropertiesSection.js",

trunk/Source/WebCore/inspector/front-end/InspectorFrontendAPI.js

@@ -108 +108 @@
     enterInspectElementMode: function()
     {
-        WebInspector.toggleSearchingForNode();
+        if (WebInspector.inspectElementModeController)
+            WebInspector.inspectElementModeController.toggleSearch();
     },
 

trunk/Source/WebCore/inspector/front-end/WebKit.qrc

@@ -133 +133 @@
     <file>NetworkRequest.js</file>
     <file>NetworkUISourceCodeProvider.js</file>
+    <file>InspectElementModeController.js</file>
     <file>Object.js</file>
     <file>ObjectPopoverHelper.js</file>

trunk/Source/WebCore/inspector/front-end/inspector.html

@@ -169 +169 @@
     <script type="text/javascript" src="Toolbar.js"></script>
     <script type="text/javascript" src="SearchController.js"></script>
+    <script type="text/javascript" src="InspectElementModeController.js"></script>
     <script type="text/javascript" src="WorkerManager.js"></script>
     <script type="text/javascript" src="UserMetrics.js"></script>

trunk/Source/WebCore/inspector/front-end/inspector.js

@@ -94 +94 @@
         mainStatusBar.insertBefore(this._toggleConsoleButton.element, bottomStatusBarContainer);
 
-        if (!WebInspector.WorkerManager.isWorkerFrontend()) {
-            this._nodeSearchButton = new WebInspector.StatusBarButton(WebInspector.UIString("Select an element in the page to inspect it."), "node-search-status-bar-item");
-            this._nodeSearchButton.addEventListener("click", this.toggleSearchingForNode, this);
-            mainStatusBar.insertBefore(this._nodeSearchButton.element, bottomStatusBarContainer);
-        }
+        if (this.inspectElementModeController)
+            mainStatusBar.insertBefore(this.inspectElementModeController.toggleSearchButton.element, bottomStatusBarContainer);
 
         mainStatusBar.appendChild(this.settingsController.statusBarItem);
@@ -274 +271 @@
     },
 
-    toggleSearchingForNode: function()
-    {
-        var enabled = !this._nodeSearchButton.toggled;
-        /**
-         * @param {?Protocol.Error} error
-         */
-        function callback(error)
-        {
-            if (!error)
-                this._nodeSearchButton.toggled = enabled;
-        }
-        WebInspector.domAgent.setInspectModeEnabled(enabled, callback.bind(this));
-    },
-
     _debuggerPaused: function()
     {
@@ -457 +440 @@
     this.searchController = new WebInspector.SearchController();
     this.advancedSearchController = new WebInspector.AdvancedSearchController();
+    if (!WebInspector.WorkerManager.isWorkerFrontend())
+        this.inspectElementModeController = new WebInspector.InspectElementModeController();
+
     this.settingsController = new WebInspector.SettingsController();
 
@@ -688 +674 @@
     section.addKey(advancedSearchShortcut, WebInspector.UIString("Search across all sources"));
 
+    var inspectElementModeShortcut = WebInspector.InspectElementModeController.createShortcut();
+    section.addKey(inspectElementModeShortcut, WebInspector.UIString("Select node to inspect"));
+
     var openResourceShortcut = WebInspector.KeyboardShortcut.makeDescriptor("o", WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta);
     section.addKey(openResourceShortcut, WebInspector.UIString("Go to source"));
@@ -742 +731 @@
         return;
     if (WebInspector.advancedSearchController.handleShortcut(event))
+        return;
+    if (WebInspector.inspectElementModeController && WebInspector.inspectElementModeController.handleShortcut(event))
         return;
 
@@ -795 +786 @@
             break;
     }
-
-    // Cmd/Control + Shift + C should be a shortcut to clicking the Node Search Button.
-    // This shortcut matches Firebug.
-    if (event.keyIdentifier === "U+0043") { // C key
-        if (WebInspector.isMac())
-            var isNodeSearchKey = event.metaKey && !event.ctrlKey && !event.altKey && event.shiftKey;
-        else
-            var isNodeSearchKey = event.ctrlKey && !event.metaKey && !event.altKey && event.shiftKey;
-
-        if (isNodeSearchKey) {
-            this.toggleSearchingForNode();
-            event.consume(true);
-            return;
-        }
-        return;
-    }
 }
 
@@ -992 +967 @@
 WebInspector._updateFocusedNode = function(nodeId)
 {
-    if (WebInspector._nodeSearchButton.toggled) {
+    if (WebInspector.inspectElementModeController && WebInspector.inspectElementModeController.enabled()) {
         InspectorFrontendHost.bringToFront();
-        WebInspector._nodeSearchButton.toggled = false;
+        WebInspector.inspectElementModeController.disable();
     }
     WebInspector.showPanel("elements").revealAndSelectNode(nodeId);