[webkit-changes] [255944] releases/WebKitGTK/webkit-2.28/Source/WebInspectorUI

Thu, 06 Feb 2020 07:12:45 -0800

Title: [255944] releases/WebKitGTK/webkit-2.28/Source/WebInspectorUI
Revision
255944
Author
[email protected]
Date
2020-02-06 07:11:36 -0800 (Thu, 06 Feb 2020)

Log Message

Merge r255893 - Web Inspector: Tab Bar: move window management items to the left and don't show reload/download unless remotely inspecting
https://bugs.webkit.org/show_bug.cgi?id=207318

Reviewed by Timothy Hatcher.

Move the window management buttons to the left side to match the system look/feel.

Hide the reload/download buttons when inspecting locally, as there are other ways of
reloading the inspected page or downloading a Web Archive.

* UserInterface/Base/Main.js:
(WI.contentLoaded):
(WI._updateDockNavigationItems):
(WI._updateReloadTabBarButton):
(WI._updateDownloadTabBarButton):
(WI._updateInspectModeTabBarButton):
(WI._updateTabBarDividers): Added.
(WI._updateConsoleTabBarButtons):

* UserInterface/Debug/Bootstrap.js:
(updateDebugUI):
(WI.runBootstrapOperations):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.28/Source/WebInspectorUI/ChangeLog (255943 => 255944)


--- releases/WebKitGTK/webkit-2.28/Source/WebInspectorUI/ChangeLog	2020-02-06 15:11:32 UTC (rev 255943)
+++ releases/WebKitGTK/webkit-2.28/Source/WebInspectorUI/ChangeLog	2020-02-06 15:11:36 UTC (rev 255944)
@@ -1,5 +1,30 @@
 2020-02-05  Devin Rousso  <[email protected]>
 
+        Web Inspector: Tab Bar: move window management items to the left and don't show reload/download unless remotely inspecting
+        https://bugs.webkit.org/show_bug.cgi?id=207318
+
+        Reviewed by Timothy Hatcher.
+
+        Move the window management buttons to the left side to match the system look/feel.
+
+        Hide the reload/download buttons when inspecting locally, as there are other ways of
+        reloading the inspected page or downloading a Web Archive.
+
+        * UserInterface/Base/Main.js:
+        (WI.contentLoaded):
+        (WI._updateDockNavigationItems):
+        (WI._updateReloadTabBarButton):
+        (WI._updateDownloadTabBarButton):
+        (WI._updateInspectModeTabBarButton):
+        (WI._updateTabBarDividers): Added.
+        (WI._updateConsoleTabBarButtons):
+
+        * UserInterface/Debug/Bootstrap.js:
+        (updateDebugUI):
+        (WI.runBootstrapOperations):
+
+2020-02-05  Devin Rousso  <[email protected]>
+
         Web Inspector: Network: the resource detail view cuts off the bottom statistics bar
         https://bugs.webkit.org/show_bug.cgi?id=207320

Modified: releases/WebKitGTK/webkit-2.28/Source/WebInspectorUI/UserInterface/Base/Main.js (255943 => 255944)


--- releases/WebKitGTK/webkit-2.28/Source/WebInspectorUI/UserInterface/Base/Main.js	2020-02-06 15:11:32 UTC (rev 255943)
+++ releases/WebKitGTK/webkit-2.28/Source/WebInspectorUI/UserInterface/Base/Main.js	2020-02-06 15:11:36 UTC (rev 255944)
@@ -362,44 +362,72 @@
 
     WI._togglePreviousDockConfigurationKeyboardShortcut = new WI.KeyboardShortcut(WI.KeyboardShortcut.Modifier.CommandOrControl | WI.KeyboardShortcut.Modifier.Shift, "D", WI._togglePreviousDockConfiguration);
 
-    let leftTabBarNavigationItems = [];
+    WI._closeTabBarButton = new WI.ButtonNavigationItem("dock-close", WI.UIString("Close"), "Images/CloseLarge.svg");
+    WI._closeTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, WI.close);
 
+    WI._dockToSideTabBarButton = new WI.ButtonNavigationItem("dock-right", WI.UIString("Dock to side of window"), WI.resolvedLayoutDirection() === WI.LayoutDirection.RTL ? "Images/DockLeft.svg" : "Images/DockRight.svg", 18, 16);
+    WI._dockToSideTabBarButton.element.classList.add(WI.Popover.IgnoreAutoDismissClassName);
+    WI._dockToSideTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, WI.resolvedLayoutDirection() === WI.LayoutDirection.RTL ? WI._dockLeft : WI._dockRight);
+
+    WI._dockBottomTabBarButton = new WI.ButtonNavigationItem("dock-bottom", WI.UIString("Dock to bottom of window"), "Images/DockBottom.svg", 18, 16);
+    WI._dockBottomTabBarButton.element.classList.add(WI.Popover.IgnoreAutoDismissClassName);
+    WI._dockBottomTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, WI._dockBottom);
+
+    WI._undockTabBarButton = new WI.ButtonNavigationItem("undock", WI.UIString("Detach into separate window"), "Images/Undock.svg", 18, 16);
+    WI._undockTabBarButton.element.classList.add(WI.Popover.IgnoreAutoDismissClassName);
+    WI._undockTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, WI._undock);
+
+    WI.tabBar.addNavigationItemBefore(new WI.GroupNavigationItem([
+        WI._closeTabBarButton,
+        WI._dockToSideTabBarButton,
+        WI._dockBottomTabBarButton,
+        WI._undockTabBarButton,
+    ]));
+
+    WI._dockDividerTabBarNavigationItem = new WI.DividerNavigationItem;
+    WI.tabBar.addNavigationItemBefore(WI._dockDividerTabBarNavigationItem);
+
+    let inspectedPageControlNavigationItems = [];
+
     let elementSelectionToolTip = WI.UIString("Start element selection (%s)").format(WI._inspectModeKeyboardShortcut.displayName);
     let activatedElementSelectionToolTip = WI.UIString("Stop element selection (%s)").format(WI._inspectModeKeyboardShortcut.displayName);
     WI._inspectModeTabBarButton = new WI.ActivateButtonNavigationItem("inspect", elementSelectionToolTip, activatedElementSelectionToolTip, "Images/Crosshair.svg");
     WI._inspectModeTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, WI._toggleInspectMode);
-    leftTabBarNavigationItems.push(WI._inspectModeTabBarButton);
+    inspectedPageControlNavigationItems.push(WI._inspectModeTabBarButton);
 
-    // COMPATIBILITY (iOS 12.2): Page.overrideSetting did not exist.
-    if ((InspectorFrontendHost.isRemote || WI.isDebugUIEnabled()) && InspectorBackend.hasCommand("Page.overrideUserAgent") && InspectorBackend.hasCommand("Page.overrideSetting")) {
-        const deviceSettingsTooltip = WI.UIString("Device Settings");
-        WI._deviceSettingsTabBarButton = new WI.ActivateButtonNavigationItem("device-settings", deviceSettingsTooltip, deviceSettingsTooltip, "Images/Device.svg");
-        WI._deviceSettingsTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, WI._handleDeviceSettingsTabBarButtonClicked);
-        leftTabBarNavigationItems.push(WI._deviceSettingsTabBarButton);
+    if (InspectorFrontendHost.isRemote || WI.isDebugUIEnabled()) {
+        // COMPATIBILITY (iOS 12.2): Page.overrideSetting did not exist.
+        if (InspectorBackend.hasCommand("Page.overrideUserAgent") && InspectorBackend.hasCommand("Page.overrideSetting")) {
+            const deviceSettingsTooltip = WI.UIString("Device Settings");
+            WI._deviceSettingsTabBarButton = new WI.ActivateButtonNavigationItem("device-settings", deviceSettingsTooltip, deviceSettingsTooltip, "Images/Device.svg");
+            WI._deviceSettingsTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, WI._handleDeviceSettingsTabBarButtonClicked);
+            inspectedPageControlNavigationItems.push(WI._deviceSettingsTabBarButton);
 
-        WI._deviceSettingsPopover = null;
-    }
+            WI._deviceSettingsPopover = null;
+        }
 
-    let reloadToolTip;
-    if (WI.sharedApp.debuggableType === WI.DebuggableType._javascript_)
-        reloadToolTip = WI.UIString("Restart (%s)").format(WI._reloadPageKeyboardShortcut.displayName);
-    else
-        reloadToolTip = WI.UIString("Reload page (%s)\nReload page ignoring cache (%s)").format(WI._reloadPageKeyboardShortcut.displayName, WI._reloadPageFromOriginKeyboardShortcut.displayName);
-    WI._reloadTabBarButton = new WI.ButtonNavigationItem("reload", reloadToolTip, "Images/ReloadToolbar.svg");
-    WI._reloadTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, WI._reloadTabBarButtonClicked);
-    leftTabBarNavigationItems.push(WI._reloadTabBarButton);
+        let reloadToolTip;
+        if (WI.sharedApp.debuggableType === WI.DebuggableType._javascript_)
+            reloadToolTip = WI.UIString("Restart (%s)").format(WI._reloadPageKeyboardShortcut.displayName);
+        else
+            reloadToolTip = WI.UIString("Reload page (%s)\nReload page ignoring cache (%s)").format(WI._reloadPageKeyboardShortcut.displayName, WI._reloadPageFromOriginKeyboardShortcut.displayName);
+        WI._reloadTabBarButton = new WI.ButtonNavigationItem("reload", reloadToolTip, "Images/ReloadToolbar.svg");
+        WI._reloadTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, WI._reloadTabBarButtonClicked);
+        inspectedPageControlNavigationItems.push(WI._reloadTabBarButton);
 
-    WI._downloadTabBarButton = new WI.ButtonNavigationItem("download", WI.UIString("Download Web Archive"), "Images/DownloadArrow.svg");
-    WI._downloadTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, WI._downloadWebArchive);
-    leftTabBarNavigationItems.push(WI._downloadTabBarButton);
+        WI._downloadTabBarButton = new WI.ButtonNavigationItem("download", WI.UIString("Download Web Archive"), "Images/DownloadArrow.svg");
+        WI._downloadTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, WI._downloadWebArchive);
+        inspectedPageControlNavigationItems.push(WI._downloadTabBarButton);
+    }
 
-    WI.tabBar.addNavigationItemBefore(new WI.GroupNavigationItem(leftTabBarNavigationItems));
+    WI.tabBar.addNavigationItemBefore(new WI.GroupNavigationItem(inspectedPageControlNavigationItems));
 
-    WI.tabBar.addNavigationItemBefore(new WI.DividerNavigationItem);
+    WI._consoleDividerNavigationItem = new WI.DividerNavigationItem;
+    WI.tabBar.addNavigationItemBefore(WI._consoleDividerNavigationItem);
 
-    WI._consoleWarningsTabBarButton = new WI.ButtonNavigationItem("console-warnings", WI.UIString("0 Console warnings"), "Images/Issues.svg");
+    WI._consoleWarningsTabBarButton = new WI.ButtonNavigationItem("console-warnings", WI.UIString("0 Console warnings"), "Images/IssuesEnabled.svg");
     WI._consoleWarningsTabBarButton.imageType = WI.ButtonNavigationItem.ImageType.IMG;
-    WI._consoleWarningsTabBarButton.enabled = false;
+    WI._consoleWarningsTabBarButton.hidden = false;
     WI._consoleWarningsTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, () => {
         WI.showConsoleTab(WI.LogContentView.Scopes.Warnings, {
             initiatorHint: WI.TabBrowser.TabNavigationInitiator.Dashboard,
@@ -406,9 +434,9 @@
         });
     }, WI);
 
-    WI._consoleErrorsTabBarButton = new WI.ButtonNavigationItem("console-errors", WI.UIString("0 Console errors"), "Images/Errors.svg");
+    WI._consoleErrorsTabBarButton = new WI.ButtonNavigationItem("console-errors", WI.UIString("0 Console errors"), "Images/ErrorsEnabled.svg");
     WI._consoleErrorsTabBarButton.imageType = WI.ButtonNavigationItem.ImageType.IMG;
-    WI._consoleErrorsTabBarButton.enabled = false;
+    WI._consoleErrorsTabBarButton.hidden = false;
     WI._consoleErrorsTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, () => {
         WI.showConsoleTab(WI.LogContentView.Scopes.Errors, {
             initiatorHint: WI.TabBrowser.TabNavigationInitiator.Dashboard,
@@ -420,31 +448,6 @@
         WI._consoleErrorsTabBarButton,
     ]));
 
-    WI._dockToSideTabBarButton = new WI.ButtonNavigationItem("dock-right", WI.UIString("Dock to side of window"), WI.resolvedLayoutDirection() === WI.LayoutDirection.RTL ? "Images/DockLeft.svg" : "Images/DockRight.svg", 18, 16);
-    WI._dockToSideTabBarButton.element.classList.add(WI.Popover.IgnoreAutoDismissClassName);
-    WI._dockToSideTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, WI.resolvedLayoutDirection() === WI.LayoutDirection.RTL ? WI._dockLeft : WI._dockRight);
-
-    WI._dockBottomTabBarButton = new WI.ButtonNavigationItem("dock-bottom", WI.UIString("Dock to bottom of window"), "Images/DockBottom.svg", 18, 16);
-    WI._dockBottomTabBarButton.element.classList.add(WI.Popover.IgnoreAutoDismissClassName);
-    WI._dockBottomTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, WI._dockBottom);
-
-    WI._undockTabBarButton = new WI.ButtonNavigationItem("undock", WI.UIString("Detach into separate window"), "Images/Undock.svg", 18, 16);
-    WI._undockTabBarButton.element.classList.add(WI.Popover.IgnoreAutoDismissClassName);
-    WI._undockTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, WI._undock);
-
-    WI.tabBar.addNavigationItemAfter(new WI.GroupNavigationItem([
-        WI._dockToSideTabBarButton,
-        WI._dockBottomTabBarButton,
-        WI._undockTabBarButton,
-    ]));
-
-    WI._dockDividerTabBarNavigationItem = new WI.DividerNavigationItem;
-    WI.tabBar.addNavigationItemAfter(WI._dockDividerTabBarNavigationItem);
-
-    WI._closeTabBarButton = new WI.ButtonNavigationItem("dock-close", WI.UIString("Close"), "Images/CloseLarge.svg");
-    WI._closeTabBarButton.addEventListener(WI.ButtonNavigationItem.Event.Clicked, WI.close);
-    WI.tabBar.addNavigationItemAfter(WI._closeTabBarButton);
-
     WI._updateInspectModeTabBarButton();
     WI._updateDownloadTabBarButton();
     WI._updateReloadTabBarButton();
@@ -1715,16 +1718,14 @@
         WI._undockTabBarButton.hidden = WI._dockConfiguration === WI.DockConfiguration.Undocked;
         WI._dockBottomTabBarButton.hidden = WI._dockConfiguration === WI.DockConfiguration.Bottom;
         WI._dockToSideTabBarButton.hidden = WI._dockConfiguration === WI.DockConfiguration.Right || WI._dockConfiguration === WI.DockConfiguration.Left;
-        WI._dockDividerTabBarNavigationItem.hidden = WI._closeTabBarButton.hidden;
     } else {
         WI._closeTabBarButton.hidden = true;
         WI._undockTabBarButton.hidden = true;
         WI._dockBottomTabBarButton.hidden = true;
         WI._dockToSideTabBarButton.hidden = true;
-        WI._dockDividerTabBarNavigationItem.hidden = true;
     }
 
-    WI.tabBar.needsLayout();
+    WI._updateTabBarDividers();
 };
 
 WI._tabBrowserSizeDidChange = function()
@@ -2205,15 +2206,21 @@
 
 WI._updateReloadTabBarButton = function()
 {
+    if (!WI._reloadTabBarButton)
+        return;
+
     WI._reloadTabBarButton.hidden = !InspectorBackend.hasDomain("Page");
-    WI.tabBar.needsLayout();
+    WI._updateTabBarDividers();
 };
 
 WI._updateDownloadTabBarButton = function()
 {
+    if (!WI._downloadTabBarButton)
+        return;
+
     if (!InspectorBackend.hasDomain("Page")) {
         WI._downloadTabBarButton.hidden = true;
-        WI.tabBar.needsLayout();
+        WI._updateTabBarDividers();
         return;
     }
 
@@ -2228,6 +2235,28 @@
 WI._updateInspectModeTabBarButton = function()
 {
     WI._inspectModeTabBarButton.hidden = !InspectorBackend.hasDomain("DOM");
+    WI._updateTabBarDividers();
+};
+
+WI._updateTabBarDividers = function()
+{
+    let closeHidden = WI._closeTabBarButton.hidden;
+    let dockToSideHidden = WI._dockToSideTabBarButton.hidden;
+    let dockBottomHidden = WI._dockBottomTabBarButton.hidden;
+    let undockHidden = WI._undockTabBarButton.hidden;
+
+    let inspectModeHidden = WI._inspectModeTabBarButton.hidden;
+    let deviceSettingsHidden = WI._deviceSettingsTabBarButton && WI._deviceSettingsTabBarButton.hidden;
+    let reloadHidden = WI._reloadTabBarButton && WI._reloadTabBarButton.hidden;
+    let downloadHidden = WI._downloadTabBarButton && WI._downloadTabBarButton.hidden;
+
+    let warningsHidden = WI._consoleWarningsTabBarButton.hidden;
+    let errorsHidden = WI._consoleErrorsTabBarButton.hidden;
+
+    // Hide the divider if everything to the left is hidden OR if everything to the right is hidden.
+    WI._dockDividerTabBarNavigationItem.hidden = (closeHidden && dockToSideHidden && dockBottomHidden && undockHidden) || (inspectModeHidden && deviceSettingsHidden && reloadHidden && downloadHidden && warningsHidden && errorsHidden);
+    WI._consoleDividerNavigationItem.hidden = (closeHidden && dockToSideHidden && dockBottomHidden && undockHidden && inspectModeHidden && deviceSettingsHidden && reloadHidden && downloadHidden) || (warningsHidden && errorsHidden);
+
     WI.tabBar.needsLayout();
 };
 
@@ -2250,34 +2279,28 @@
     let warningCount = WI.consoleManager.warningCount;
     if (warningCount) {
         let warningFormat = (warningCount === 1) ? WI.UIString("Click to show %d warning in the Console") : WI.UIString("Click to show %d warnings in the Console");
-        WI._consoleWarningsTabBarButton.image = "Images/IssuesEnabled.svg";
         WI._consoleWarningsTabBarButton.tooltip = warningFormat.format(warningCount);
-        WI._consoleWarningsTabBarButton.enabled = true;
+        WI._consoleWarningsTabBarButton.hidden = false;
 
         if (warningCount !== WI._consoleWarningsTabBarButton.__lastWarningCount)
             pulse(WI._consoleWarningsTabBarButton.element);
     } else {
-        WI._consoleWarningsTabBarButton.image = "Images/Issues.svg";
-        WI._consoleWarningsTabBarButton.tooltip = WI.UIString("0 Console warnings")
-        WI._consoleWarningsTabBarButton.enabled = false;
+        WI._consoleWarningsTabBarButton.hidden = true;
     }
 
     let errorCount = WI.consoleManager.errorCount;
     if (errorCount) {
         let errorFormat = (errorCount === 1) ? WI.UIString("Click to show %d error in the Console") : WI.UIString("Click to show %d errors in the Console");
-        WI._consoleErrorsTabBarButton.image = "Images/ErrorsEnabled.svg";
         WI._consoleErrorsTabBarButton.tooltip = errorFormat.format(errorCount);
-        WI._consoleErrorsTabBarButton.enabled = true;
+        WI._consoleErrorsTabBarButton.hidden = false;
 
         if (errorCount !== WI._consoleErrorsTabBarButton.__lastErrorCount)
             pulse(WI._consoleErrorsTabBarButton.element);
     } else {
-        WI._consoleErrorsTabBarButton.image = "Images/Errors.svg";
-        WI._consoleErrorsTabBarButton.tooltip = WI.UIString("0 Console errors")
-        WI._consoleErrorsTabBarButton.enabled = false;
+        WI._consoleErrorsTabBarButton.hidden = true;
     }
 
-    WI.tabBar.needsLayout();
+    WI._updateTabBarDividers();
 
     WI._consoleWarningsTabBarButton.__lastWarningCount = warningCount;
     WI._consoleErrorsTabBarButton.__lastErrorCount = errorCount;

Modified: releases/WebKitGTK/webkit-2.28/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js (255943 => 255944)


--- releases/WebKitGTK/webkit-2.28/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js	2020-02-06 15:11:32 UTC (rev 255943)
+++ releases/WebKitGTK/webkit-2.28/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js	2020-02-06 15:11:36 UTC (rev 255944)
@@ -122,9 +122,6 @@
         InspectorFrontendHost.inspectInspector();
     });
 
-    let dividerNavigationItem = new WI.DividerNavigationItem;
-    WI.tabBar.addNavigationItemAfter(dividerNavigationItem);
-
     let groupNavigationItem = new WI.GroupNavigationItem([
         dumpMessagesTabBarNavigationItem,
         inspectInspectorTabBarNavigationItem,
@@ -131,12 +128,7 @@
     ]);
     WI.tabBar.addNavigationItemAfter(groupNavigationItem);
 
-    // Move the close button to the end of the tab bar after the debug items are added.
-    WI.tabBar.addNavigationItemAfter(WI._dockDividerTabBarNavigationItem);
-    WI.tabBar.addNavigationItemAfter(WI._closeTabBarButton);
-
     function updateDebugUI() {
-        dividerNavigationItem.hidden = !WI.showDebugUISetting.value;
         groupNavigationItem.hidden = !WI.showDebugUISetting.value;
         WI.tabBar.needsLayout();
     }

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to