Changeset 288533 in webkit

Timestamp:

Jan 24, 2022 7:21:04 PM (6 months ago)

Author:

Devin Rousso

Message:

Web Inspector: Network: give the Ignore Caches button a label so it's more visible and immediately understandable
​https://bugs.webkit.org/show_bug.cgi?id=235539

Reviewed by Patrick Angle.

• UserInterface/Views/NetworkTableContentView.js:

(WI.NetworkTableContentView):
(WI.NetworkTableContentView.prototype.get navigationItems):
(WI.NetworkTableContentView.prototype._resourceCachingDisabledSettingChanged):

• Localizations/en.lproj/localizedStrings.js:

• UserInterface/Images/IgnoreCaches.svg: Deleted.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Localizations/en.lproj/localizedStrings.js (modified) (3 diffs)
• UserInterface/Images/IgnoreCaches.svg (deleted)
• UserInterface/Views/NetworkTableContentView.js (modified) (3 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2022-01-24  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Network: give the Ignore Caches button a label so it's more visible and immediately understandable
+        https://bugs.webkit.org/show_bug.cgi?id=235539
+
+        Reviewed by Patrick Angle.
+
+        * UserInterface/Views/NetworkTableContentView.js:
+        (WI.NetworkTableContentView):
+        (WI.NetworkTableContentView.prototype.get navigationItems):
+        (WI.NetworkTableContentView.prototype._resourceCachingDisabledSettingChanged):
+
+        * Localizations/en.lproj/localizedStrings.js:
+
+        * UserInterface/Images/IgnoreCaches.svg: Deleted.
+
 2022-01-24  Patrick Angle  <pangle@apple.com>
 

trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

@@ -489 +489 @@
 localizedStrings["Disable Breakpoint"] = "Disable Breakpoint";
 localizedStrings["Disable Breakpoints"] = "Disable Breakpoints";
+localizedStrings["Disable Caches"] = "Disable Caches";
 localizedStrings["Disable Descendant Breakpoints"] = "Disable Descendant Breakpoints";
 localizedStrings["Disable Encryption"] = "Disable Encryption";
@@ -792 +793 @@
 localizedStrings["Ignore"] = "Ignore";
 localizedStrings["Ignore script when debugging"] = "Ignore script when debugging";
-localizedStrings["Ignore the resource cache when loading resources"] = "Ignore the resource cache when loading resources";
 localizedStrings["Ignored"] = "Ignored";
 localizedStrings["Image"] = "Image";
@@ -1632 +1632 @@
 localizedStrings["Use default media styles"] = "Use default media styles";
 localizedStrings["Use fuzzy matching for completion suggestions"] = "Use fuzzy matching for completion suggestions";
-localizedStrings["Use the resource cache when loading resources"] = "Use the resource cache when loading resources";
 localizedStrings["User Agent"] = "User Agent";
 localizedStrings["User Agent Style Sheet"] = "User Agent Style Sheet";

trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js

@@ -142 +142 @@
         // COMPATIBILITY (iOS 10.3): Network.setDisableResourceCaching did not exist.
         if (InspectorBackend.hasCommand("Network.setResourceCachingDisabled")) {
-            let toolTipForDisableResourceCache = WI.UIString("Ignore the resource cache when loading resources");
-            let activatedToolTipForDisableResourceCache = WI.UIString("Use the resource cache when loading resources");
-            this._disableResourceCacheNavigationItem = new WI.ActivateButtonNavigationItem("disable-resource-cache", toolTipForDisableResourceCache, activatedToolTipForDisableResourceCache, "Images/IgnoreCaches.svg", 16, 16);
-            this._disableResourceCacheNavigationItem.activated = WI.settings.resourceCachingDisabled.value;
-            this._disableResourceCacheNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.High;
-            this._disableResourceCacheNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._toggleDisableResourceCache, this);
+            this._disableResourceCacheNavigationItem = new WI.CheckboxNavigationItem("network-disable-resource-cache", WI.UIString("Disable Caches"), WI.settings.resourceCachingDisabled.value);
+            this._disableResourceCacheNavigationItem.addEventListener(WI.CheckboxNavigationItem.Event.CheckedDidChange, this._toggleDisableResourceCache, this);
+
+            this._disableResourceCacheNavigationItemGroup = new WI.GroupNavigationItem([this._disableResourceCacheNavigationItem, new WI.DividerNavigationItem]);
+            this._disableResourceCacheNavigationItemGroup.visibilityPriority = WI.NavigationItem.VisibilityPriority.High;
 
             WI.settings.resourceCachingDisabled.addEventListener(WI.Setting.Event.Changed, this._resourceCachingDisabledSettingChanged, this);
@@ -245 +244 @@
     get navigationItems()
     {
-        let items = [this._pathComponentsNavigationItemGroup, this._buttonsNavigationItemGroup];
-        if (this._disableResourceCacheNavigationItem)
-            items.push(this._disableResourceCacheNavigationItem);
-        items.push(this._clearNetworkItemsNavigationItem);
+        let items = [];
+        if (this._disableResourceCacheNavigationItemGroup)
+            items.push(this._disableResourceCacheNavigationItemGroup);
+        items.push(this._pathComponentsNavigationItemGroup, this._buttonsNavigationItemGroup, this._clearNetworkItemsNavigationItem);
         return items;
     }
@@ -1627 +1626 @@
     _resourceCachingDisabledSettingChanged()
     {
-        this._disableResourceCacheNavigationItem.activated = WI.settings.resourceCachingDisabled.value;
+        this._disableResourceCacheNavigationItem.checked = WI.settings.resourceCachingDisabled.value;
     }