Title: [288533] trunk/Source/WebInspectorUI
Revision
288533
Author
[email protected]
Date
2022-01-24 19:21:04 -0800 (Mon, 24 Jan 2022)

Log 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.

Modified Paths

Removed Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (288532 => 288533)


--- trunk/Source/WebInspectorUI/ChangeLog	2022-01-25 02:14:33 UTC (rev 288532)
+++ trunk/Source/WebInspectorUI/ChangeLog	2022-01-25 03:21:04 UTC (rev 288533)
@@ -1,3 +1,19 @@
+2022-01-24  Devin Rousso  <[email protected]>
+
+        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  <[email protected]>
 
         Web Inspector: [Flexbox] Add instrumentation/protocol bits for flex layout containers

Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (288532 => 288533)


--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js	2022-01-25 02:14:33 UTC (rev 288532)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js	2022-01-25 03:21:04 UTC (rev 288533)
@@ -488,6 +488,7 @@
 localizedStrings["Disable Audit"] = "Disable Audit";
 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";
 localizedStrings["Disable Event Listener"] = "Disable Event Listener";
@@ -791,7 +792,6 @@
 localizedStrings["If the URL of any script matches one of the regular _expression_ patterns below, any pauses that would have happened in that script will be deferred until execution has continued to outside of that script."] = "If the URL of any script matches one of the regular _expression_ patterns below, any pauses that would have happened in that script will be deferred until execution has continued to outside of that script.";
 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";
 localizedStrings["Image Size"] = "Image Size";
@@ -1631,7 +1631,6 @@
 localizedStrings["Use Mock Capture Devices"] = "Use Mock Capture Devices";
 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";
 localizedStrings["User Agent:"] = "User Agent:";

Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/IgnoreCaches.svg (288532 => 288533)


--- trunk/Source/WebInspectorUI/UserInterface/Images/IgnoreCaches.svg	2022-01-25 02:14:33 UTC (rev 288532)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/IgnoreCaches.svg	2022-01-25 03:21:04 UTC (rev 288533)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright © 2017 Apple Inc. All rights reserved. -->
-<svg xmlns="http://www.w3.org/2000/svg" id="root" viewBox="0 0 16 16">
-    <path fill="none" stroke="currentColor" d="M 10.4 6"/>
-    <path fill="none" stroke="currentColor" d="M 12.3 4 C 12.4 4 12.4 4 12.3 4"/>
-    <path fill="none" stroke="currentColor" d="M 10 4"/>
-    <path fill="none" stroke="currentColor" d="M 9 5"/>
-    <path fill="none" stroke="currentColor" d="M -7.5-2.4"/>
-    <path fill="none" stroke="currentColor" stroke-linecap="round" d="M 10.4 2.8 C 9.7 2.6 8.9 2.5 8 2.5 c -2.5 0-4.5 0.9-4.5 2 c 0 0.9 1.3 1.7 3.2 1.9"/>
-    <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M 12.5 11.2 V 3.8 V 11.2 z"/>
-    <path fill="none" stroke="currentColor" stroke-linecap="square" stroke-linejoin="round" d="M 3.5 10 V 4.5 v 4.6"/>
-    <path fill="none" stroke="currentColor" stroke-linejoin="round" d="M 12.5 11 c 0 1.2-2 2.2-4.5 2.2 c -1.5 0-2.9-0.4-3.7-1"/>
-    <polyline fill="none" stroke="currentColor" stroke-linejoin="round" points="1.2 15 10.2 6 12.8 3.4 14.8 1.5"/>
-</svg>

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js (288532 => 288533)


--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js	2022-01-25 02:14:33 UTC (rev 288532)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js	2022-01-25 03:21:04 UTC (rev 288533)
@@ -141,13 +141,12 @@
 
         // 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);
         }
 
@@ -244,10 +243,10 @@
 
     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;
     }
 
@@ -1626,7 +1625,7 @@
 
     _resourceCachingDisabledSettingChanged()
     {
-        this._disableResourceCacheNavigationItem.activated = WI.settings.resourceCachingDisabled.value;
+        this._disableResourceCacheNavigationItem.checked = WI.settings.resourceCachingDisabled.value;
     }
 
     _toggleDisableResourceCache()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to