Title: [239179] trunk/Source/WebInspectorUI
Revision
239179
Author
drou...@apple.com
Date
2018-12-13 14:31:25 -0800 (Thu, 13 Dec 2018)

Log Message

Web Inspector: experimental settings reload button disappears after changing more than one setting
https://bugs.webkit.org/show_bug.cgi?id=192645
<rdar://problem/46626204>

Reviewed by Joseph Pecoraro.

* UserInterface/Views/SettingsTabContentView.js:
(WI.SettingsTabContentView.prototype._createExperimentalSettingsView.listenForChange):
(WI.SettingsTabContentView.prototype._createExperimentalSettingsView):

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (239178 => 239179)


--- trunk/Source/WebInspectorUI/ChangeLog	2018-12-13 22:29:07 UTC (rev 239178)
+++ trunk/Source/WebInspectorUI/ChangeLog	2018-12-13 22:31:25 UTC (rev 239179)
@@ -1,3 +1,15 @@
+2018-12-13  Devin Rousso  <drou...@apple.com>
+
+        Web Inspector: experimental settings reload button disappears after changing more than one setting
+        https://bugs.webkit.org/show_bug.cgi?id=192645
+        <rdar://problem/46626204>
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/SettingsTabContentView.js:
+        (WI.SettingsTabContentView.prototype._createExperimentalSettingsView.listenForChange):
+        (WI.SettingsTabContentView.prototype._createExperimentalSettingsView):
+
 2018-12-13  Matt Baker  <mattba...@apple.com>
 
         Web Inspector: REGRESSION(r238602): Elements: deleting multiple DOM nodes doesn't select the nearest node after deletion

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js (239178 => 239179)


--- trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js	2018-12-13 22:29:07 UTC (rev 239178)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js	2018-12-13 22:31:25 UTC (rev 239179)
@@ -242,6 +242,8 @@
 
         let experimentalSettingsView = new WI.SettingsView("experimental", WI.UIString("Experimental"));
 
+        let initialValues = new Map;
+
         if (window.CSSAgent) {
             let group = experimentalSettingsView.addGroup(WI.UIString("Styles Sidebar:"));
             group.addSetting(WI.settings.experimentalEnableComputedStyleCascades, WI.UIString("Enable Computed Style Cascades"));
@@ -248,13 +250,11 @@
             experimentalSettingsView.addSeparator();
         }
 
-        let layerTabEnabled = window.LayerTreeAgent && WI.settings.experimentalEnableLayersTab.value;
         if (window.LayerTreeAgent) {
             experimentalSettingsView.addSetting(WI.UIString("Layers:"), WI.settings.experimentalEnableLayersTab, WI.UIString("Enable Layers Tab"));
             experimentalSettingsView.addSeparator();
         }
 
-        let auditTabEnabled = WI.settings.experimentalEnableAuditTab.value;
         experimentalSettingsView.addSetting(WI.UIString("Audit:"), WI.settings.experimentalEnableAuditTab, WI.UIString("Enable Audit Tab"));
         experimentalSettingsView.addSeparator();
 
@@ -266,9 +266,9 @@
         reloadInspectorButton.addEventListener("click", (event) => {
             // Force a copy so that WI.Setting sees it as a new value.
             let newTabs = WI._openTabsSetting.value.slice();
-            if (!layerTabEnabled && window.LayerTreeAgent && WI.settings.experimentalEnableLayersTab.value)
+            if (!initialValues.get(WI.settings.experimentalEnableLayersTab) && window.LayerTreeAgent && WI.settings.experimentalEnableLayersTab.value)
                 newTabs.push(WI.LayersTabContentView.Type);
-            if (!auditTabEnabled && WI.settings.experimentalEnableAuditTab.value)
+            if (!initialValues.get(WI.settings.experimentalEnableAuditTab) && WI.settings.experimentalEnableAuditTab.value)
                 newTabs.push(WI.AuditTabContentView.Type);
             WI._openTabsSetting.value = newTabs;
 
@@ -279,9 +279,9 @@
         reloadInspectorContainerElement.classList.add("hidden");
 
         function listenForChange(setting) {
-            let initialValue = setting.value;
+            initialValues.set(setting, setting.value);
             setting.addEventListener(WI.Setting.Event.Changed, () => {
-                reloadInspectorContainerElement.classList.toggle("hidden", initialValue === setting.value);
+                reloadInspectorContainerElement.classList.toggle("hidden", Array.from(initialValues).every(([setting, initialValue]) => setting.value === initialValue));
             });
         }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to