Changeset 261198 in webkit

Timestamp:

May 5, 2020 2:01:27 PM (4 years ago)

Author:

Devin Rousso

Message:

Web Inspector: the divider before the console message icons in the tab bar is shown even if there are no other icons
​https://bugs.webkit.org/show_bug.cgi?id=211390

Reviewed by Brian Burg.

• UserInterface/Base/Main.js:

(WI._updateTabBarDividers):
(WI._updateTabBarDividers.isHidden): Added.
If the various WI.ButtonNavigationItem aren't actually created, then the optional chain
will return undefined instead of the desired true when checking whether it is hidden.
Effectively, a WI.ButtonNavigationItem that does not exist should be considered hidden.

Location:

trunk/Source/WebInspectorUI

Files:

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

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2020-05-05  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: the divider before the console message icons in the tab bar is shown even if there are no other icons
+        https://bugs.webkit.org/show_bug.cgi?id=211390
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Base/Main.js:
+        (WI._updateTabBarDividers):
+        (WI._updateTabBarDividers.isHidden): Added.
+        If the various `WI.ButtonNavigationItem` aren't actually created, then the optional chain
+        will return `undefined` instead of the desired `true` when checking whether it is `hidden`.
+        Effectively, a `WI.ButtonNavigationItem` that does not exist should be considered `hidden`.
+
 2020-05-05  Devin Rousso  <drousso@apple.com>
 

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

@@ -2416 +2416 @@
 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;
+    function isHidden(navigationItem) {
+        return !navigationItem || navigationItem.hidden;
+    }
+
+    let closeHidden = isHidden(WI._closeTabBarButton);
+    let dockToSideHidden = isHidden(WI._dockToSideTabBarButton);
+    let dockBottomHidden = isHidden(WI._dockBottomTabBarButton);
+    let undockHidden = isHidden(WI._undockTabBarButton);
+
+    let inspectModeHidden = isHidden(WI._inspectModeTabBarButton);
+    let deviceSettingsHidden = isHidden(WI._deviceSettingsTabBarButton);
+    let reloadHidden = isHidden(WI._reloadTabBarButton);
+    let downloadHidden = isHidden(WI._downloadTabBarButton);
 
     let warningsHidden = WI._consoleWarningsTabBarButton.hidden;