Changeset 112677 in webkit

Timestamp:

Mar 30, 2012, 9:39:02 AM (13 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: ScriptsNavigator scripts selection/focus polish.
​https://bugs.webkit.org/show_bug.cgi?id=82732

Reviewed by Pavel Feldman.

Script could be selected by space in ScriptsNavigator now.
This patch also polishes focus behavior when using ScriptsNavigator.

• inspector/front-end/ScriptsNavigator.js:

(WebInspector.ScriptsNavigator.prototype._scriptSelected): Added focusSource param to give clients possibility to release focus.
(WebInspector.NavigatorScriptTreeElement.prototype.onspace): Added script selection on space pressed.
(WebInspector.NavigatorScriptTreeElement.prototype._onclick):
(WebInspector.NavigatorScriptTreeElement.prototype.onenter):

• inspector/front-end/ScriptsPanel.js: _hideNavigatorOverlay moved to the end of events processing to set focus correctly.

(WebInspector.ScriptsPanel.prototype._editorSelected):
(WebInspector.ScriptsPanel.prototype._fileSelected):
(WebInspector.ScriptsPanel.prototype._hideNavigatorOverlay):

• inspector/front-end/treeoutline.js:

(TreeOutline.prototype._treeKeyDown): onspace event added.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ScriptsNavigator.js (modified) (3 diffs)
• inspector/front-end/ScriptsPanel.js (modified) (2 diffs)
• inspector/front-end/treeoutline.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-30  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: ScriptsNavigator scripts selection/focus polish.
+        https://bugs.webkit.org/show_bug.cgi?id=82732
+
+        Reviewed by Pavel Feldman.
+
+        Script could be selected by space in ScriptsNavigator now.
+        This patch also polishes focus behavior when using ScriptsNavigator.
+
+        * inspector/front-end/ScriptsNavigator.js:
+        (WebInspector.ScriptsNavigator.prototype._scriptSelected): Added focusSource param to give clients possibility to release focus.
+        (WebInspector.NavigatorScriptTreeElement.prototype.onspace): Added script selection on space pressed.
+        (WebInspector.NavigatorScriptTreeElement.prototype._onclick):
+        (WebInspector.NavigatorScriptTreeElement.prototype.onenter):
+        * inspector/front-end/ScriptsPanel.js: _hideNavigatorOverlay moved to the end of events processing to set focus correctly.
+        (WebInspector.ScriptsPanel.prototype._editorSelected):
+        (WebInspector.ScriptsPanel.prototype._fileSelected):
+        (WebInspector.ScriptsPanel.prototype._hideNavigatorOverlay):
+        * inspector/front-end/treeoutline.js:
+        (TreeOutline.prototype._treeKeyDown): onspace event added.
+
 2012-03-30  Mike Reed  <reed@google.com>
 

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

@@ -232 +232 @@
     /**
      * @param {WebInspector.UISourceCode} uiSourceCode
-     */
-    scriptSelected: function(uiSourceCode)
+     * @param {boolean} focusSource
+     */
+    _scriptSelected: function(uiSourceCode, focusSource)
     {
         this._lastSelectedUISourceCode = uiSourceCode;
         this.dispatchEventToListeners(WebInspector.ScriptsPanel.FileSelector.Events.FileSelected, uiSourceCode);
+        if (focusSource)
+            this.dispatchEventToListeners(WebInspector.ScriptsPanel.FileSelector.Events.ReleasedFocusAfterSelection, uiSourceCode);
     },
 
@@ -722 +725 @@
     },
 
+    onspace: function()
+    {
+        this._navigator._scriptSelected(this.uiSourceCode, true);
+        return true;
+    },
+
     /**
      * @param {Event} event
@@ -727 +736 @@
     _onclick: function(event)
     {
-        this._navigator.scriptSelected(this.uiSourceCode);
+        this._navigator._scriptSelected(this.uiSourceCode, false);
     },
 
     onenter: function()
     {
-        this._navigator.scriptSelected(this.uiSourceCode);
+        this._navigator._scriptSelected(this.uiSourceCode, true);
+        return true;
     },
 

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

@@ -671 +671 @@
     _editorSelected: function(event)
     {
-        this._hideNavigatorOverlay();
         var uiSourceCode = /** @type {WebInspector.UISourceCode} */ event.data;
         this._showFile(uiSourceCode);
+        this._hideNavigatorOverlay();
     },
 
     _fileSelected: function(event)
     {
-        this._hideNavigatorOverlay();
         var uiSourceCode = /** @type {WebInspector.UISourceCode} */ event.data;
         this._showFile(uiSourceCode);
+        this._hideNavigatorOverlay();
     },
 
@@ -1047 +1047 @@
 
         this._sidebarOverlay.hide();
+        if (this.visibleView)
+            this.visibleView.focus();
     },
 

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

@@ -410 +410 @@
         if (this.selectedTreeElement.onenter)
             handled = this.selectedTreeElement.onenter();
+    } else if (event.keyCode === WebInspector.KeyboardShortcut.Keys.Space.code) {
+        if (this.selectedTreeElement.onspace)
+            handled = this.selectedTreeElement.onspace();
     }