Changeset 251922 in webkit

Timestamp:

Nov 1, 2019 9:19:14 AM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Sources: tab isn't visible after removal of Debugger Tab and Resources Tab
​https://bugs.webkit.org/show_bug.cgi?id=203719
<rdar://problem/56802389>

Reviewed by Timothy Hatcher.

• UserInterface/Base/Main.js:

(WI.loaded):
If the Debugger Tab identifier or Resources Tab identifier still exists in the list of open
tabs, remove both and replace the first one with the Sources Tab identifier.

Location:

trunk/Source/WebInspectorUI

Files:

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

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-11-01  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Sources: tab isn't visible after removal of Debugger Tab and Resources Tab
+        https://bugs.webkit.org/show_bug.cgi?id=203719
+        <rdar://problem/56802389>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Base/Main.js:
+        (WI.loaded):
+        If the Debugger Tab identifier or Resources Tab identifier still exists in the list of open
+        tabs, remove both and replace the first one with the Sources Tab identifier.
+
 2019-11-01  Devin Rousso  <drousso@apple.com>
 

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

@@ -152 +152 @@
     WI._selectedTabIndexSetting = new WI.Setting("selected-tab-index", 0);
 
+    // Replace the Debugger/Resources Tab with the Sources Tab.
+    let debuggerIndex = WI._openTabsSetting.value.indexOf("debugger");
+    let resourcesIndex = WI._openTabsSetting.value.indexOf("resources");
+    if (debuggerIndex >= 0 || resourcesIndex >= 0) {
+        WI._openTabsSetting.value.remove("debugger");
+        WI._openTabsSetting.value.remove("resources");
+
+        if (debuggerIndex === -1)
+            debuggerIndex = Infinity;
+        if (resourcesIndex === -1)
+            resourcesIndex = Infinity;
+
+        let sourcesIndex = Math.min(debuggerIndex, resourcesIndex);
+        WI._openTabsSetting.value.splice(sourcesIndex, 1, WI.SourcesTabContentView.Type);
+        WI._openTabsSetting.save();
+
+        if (WI._selectedTabIndexSetting.value === debuggerIndex || WI._selectedTabIndexSetting.value === resourcesIndex)
+            WI._selectedTabIndexSetting.value = sourcesIndex;
+    }
+
     // State.
     WI.printStylesEnabled = false;