Changeset 251958 in webkit

Timestamp:

Nov 1, 2019 5:19:13 PM (4 years ago)

Author:

Devin Rousso

Message:

Web Inspector: default to focusing the console prompt if no other content is focused after opening Web Inspector
​https://bugs.webkit.org/show_bug.cgi?id=203743

Reviewed by Eric Carlson and Brian Burg.

• UserInterface/Base/Main.js:

(WI.isContentAreaFocused): Added.
(WI.isConsoleFocused):
(WI._focusChanged):
(WI._restoreCookieForOpenTabs):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (3 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-11-01  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: default to focusing the console prompt if no other content is focused after opening Web Inspector
+        https://bugs.webkit.org/show_bug.cgi?id=203743
+
+        Reviewed by Eric Carlson and Brian Burg.
+
+        * UserInterface/Base/Main.js:
+        (WI.isContentAreaFocused): Added.
+        (WI.isConsoleFocused):
+        (WI._focusChanged):
+        (WI._restoreCookieForOpenTabs):
+
 2019-11-01  Nikita Vasilyev  <nvasilyev@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -934 +934 @@
 };
 
+WI.isContentAreaFocused = function()
+{
+    return WI._contentElement.contains(document.activeElement);
+}
+
 WI.isConsoleFocused = function()
 {
-    return WI.quickConsole.prompt.focused;
+    return !WI._didAutofocusConsolePrompt && WI.quickConsole.prompt.focused;
 };
 
@@ -1375 +1380 @@
 WI._focusChanged = function(event)
 {
+    WI._didAutofocusConsolePrompt = false;
+
     // Make a caret selection inside the focused element if there isn't a range selection and there isn't already
     // a caret selection inside. This is needed (at least) to remove caret from console when focus is moved.
@@ -1549 +1556 @@
         tabContentView.restoreStateFromCookie(restorationType);
     }
+
+    window.requestAnimationFrame(() => {
+        if (WI.isContentAreaFocused())
+            return;
+
+        WI.quickConsole.prompt.focus();
+        WI._didAutofocusConsolePrompt = true;
+    });
 };