Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (223267 => 223268)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-10-13 00:41:45 UTC (rev 223267)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-10-13 00:47:51 UTC (rev 223268)
@@ -1,3 +1,23 @@
+2017-10-12 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Switch Clear navigation item back to the Trash icon (Console, Timelines, Network)
+ https://bugs.webkit.org/show_bug.cgi?id=178244
+ <rdar://problem/34966525>
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Images/NavigationItemClear.svg: Removed.
+ * UserInterface/Images/gtk/NavigationItemClear.svg: Removed.
+ * UserInterface/Views/LogContentView.js:
+ (WI.LogContentView):
+ * UserInterface/Views/NetworkGridContentView.js:
+ (WI.NetworkGridContentView):
+ * UserInterface/Views/NetworkTableContentView.js:
+ (WI.NetworkTableContentView):
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WI.TimelineRecordingContentView):
+ Many users found the new Clear icon confusing. Revert to the Trash icon.
+
2017-10-11 Ross Kirsling <[email protected]>
Web Inspector: Make 3D objects selectable in Layers visualization
Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/NavigationItemClear.svg (223267 => 223268)
--- trunk/Source/WebInspectorUI/UserInterface/Images/NavigationItemClear.svg 2017-10-13 00:41:45 UTC (rev 223267)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/NavigationItemClear.svg 2017-10-13 00:47:51 UTC (rev 223268)
@@ -1,5 +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="currentColor" d="M 9.38066676 6.71328638 L 9.38084131 6.71345522 L 9.03321313 7.07283614 C 8.34006053 7.78942309 7.82996463 8.86291236 7.48930595 10.201304 C 7.34290914 10.7764729 7.23264093 11.3805021 7.15379764 12.000095 L 16 12.000095 L 16 13.000095 L 7.05390553 13.000095 C 7.01158674 13.5672195 6.99999574 14.0064243 7 14.500095 L 7 15.000095 L 6 15.000095 L 5.99999998 14.4963579 C 5.99999528 13.9539593 6.0136353 13.4688203 6.06463707 12.8219901 C 6.14246564 11.834929 6.28819758 10.8661584 6.52020482 9.95464025 C 6.88091812 8.53745734 7.42329613 7.36284812 8.19034778 6.51060821 L 5.53467726 3.85493768 C 1.85676337 7.51654858 1 9.65694564 1 12.500095 L 1 13.000095 L -3.55271368e-15 13.000095 L -3.55271368e-15 12.7467876 L 0 3.19556419 C 0 3.12968996 0.00288278561 3.06449331 0.00852984359 3.00009504 L 1 3.19556419 C 1 3.1289629 1.00536922 3.06366984 1.01569858 3.00009504 L 3 3.00009504 L 3 4.00009504 L 1 4.00009504 L 1 8.03017961 C 1.73047296 6.576
70057 2.93656495 5.02763459 4.85309317 3.12243561 L 4.97295074 3.00328655 L 7.89824887 0.0779884347 L 11.9571068 4.13684636 L 9.38066676 6.71328638 Z M 16 3.00009504 L 16 4.00009504 L 13.0083506 4.00009504 L 13.0083506 3.00009504 L 16 3.00009504 Z M 0 12.9934802 L 0 3.19556419 C 0 1.98298757 0.976786375 1 2.19118333 1 L 4.55065918 1 L 4.05065918 1 L 4.05065918 1.99804688 L 5.05065918 1.99804688 L 2.19118333 2 C 1.53128332 2 1 2.53305798 1 3.19556419 L 1 10.8164508 L 0 12.9934802 Z M 13.7911896 14.000095 C 14.4583628 14.000095 15 13.4602011 15 12.7971792 L 15 3.20291582 C 15 2.5363078 14.466244 2 13.8088167 2 L 11.0236867 2 L 11.0236867 1 L 13.8088167 1 C 15.0189738 1 16 1.9844595 16 3.20291582 L 16 12.7971792 C 16 14.013816 15.009318 15.000095 13.7911896 15.000095 L 6.04737349 15.000095 L 6.40282202 14.000095 L 13.7911896 14.000095 Z M 13.7911896 14.000095 C 14.4583628 14.000095 15 13.4602011 15 12.7971792 L 15 3.20291582 C 15 2.5363078 14.466244 2 13.8088167 2 L 11.0236867 2 L 11.0
236867 1 L 13.8088167 1 C 15.0189738 1 16 1.9844595 16 3.20291582 L 16 12.7971792 C 16 14.013816 15.009318 15.000095 13.7911896 15.000095 L 6.04737349 15.000095 L 6.40282202 14.000095 L 13.7911896 14.000095 Z M 8.88684636 5.79289322 L 10.5428932 4.13684636 L 7.89824887 1.49220199 L 6.242202 3.14824886 L 8.88684636 5.79289322 Z"/>
-</svg>
Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/gtk/NavigationItemClear.svg (223267 => 223268)
--- trunk/Source/WebInspectorUI/UserInterface/Images/gtk/NavigationItemClear.svg 2017-10-13 00:41:45 UTC (rev 223267)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/gtk/NavigationItemClear.svg 2017-10-13 00:47:51 UTC (rev 223268)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed under the Creative Commons Attribution-Share Alike 3.0 United States License (http://creativecommons.org/licenses/by-sa/3.0/) -->
-<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16">
- <path fill="currentColor" d="m4 0c-2 0-2 2-2 2h-2v2h15v-2h-2c0-2-2-2-2-2h-7zm-3 5v9s0 2 2 2h9s2 0 2-2v-9h-2v9h-9v-9h-2zm4 1v6h1v-6h-1zm2 0v6h1v-6h-1zm2 0v6h1v-6h-1z"/>
-</svg>
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (223267 => 223268)
--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2017-10-13 00:41:45 UTC (rev 223267)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2017-10-13 00:47:51 UTC (rev 223268)
@@ -76,11 +76,11 @@
this._scopeBar = new WI.ScopeBar("log-scope-bar", scopeBarItems, scopeBarItems[0]);
this._scopeBar.addEventListener(WI.ScopeBar.Event.SelectionChanged, this._scopeBarSelectionDidChange, this);
- this._garbageCollectNavigationItem = new WI.ButtonNavigationItem("clear-log", WI.UIString("Collect garbage"), "Images/NavigationItemGarbageCollect.svg", 16, 16);
+ this._garbageCollectNavigationItem = new WI.ButtonNavigationItem("garbage-collect", WI.UIString("Collect garbage"), "Images/NavigationItemGarbageCollect.svg", 16, 16);
this._garbageCollectNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
this._garbageCollectNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._garbageCollect, this);
- this._clearLogNavigationItem = new WI.ButtonNavigationItem("clear-log", WI.UIString("Clear log (%s or %s)").format(WI.clearKeyboardShortcut.displayName, this._logViewController.messagesAlternateClearKeyboardShortcut.displayName), "Images/NavigationItemClear.svg", 16, 16);
+ this._clearLogNavigationItem = new WI.ButtonNavigationItem("clear-log", WI.UIString("Clear log (%s or %s)").format(WI.clearKeyboardShortcut.displayName, this._logViewController.messagesAlternateClearKeyboardShortcut.displayName), "Images/NavigationItemTrash.svg", 15, 15);
this._clearLogNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
this._clearLogNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._clearLog, this);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (223267 => 223268)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2017-10-13 00:41:45 UTC (rev 223267)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2017-10-13 00:47:51 UTC (rev 223268)
@@ -140,7 +140,7 @@
WI.resourceCachingDisabledSetting.addEventListener(WI.Setting.Event.Changed, this._resourceCachingDisabledSettingChanged, this);
}
- this._clearNetworkItemsNavigationItem = new WI.ButtonNavigationItem("clear-network-items", WI.UIString("Clear Network Items (%s)").format(WI.clearKeyboardShortcut.displayName), "Images/NavigationItemClear.svg", 16, 16);
+ this._clearNetworkItemsNavigationItem = new WI.ButtonNavigationItem("clear-network-items", WI.UIString("Clear Network Items (%s)").format(WI.clearKeyboardShortcut.displayName), "Images/NavigationItemTrash.svg", 15, 15);
this._clearNetworkItemsNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
this._clearNetworkItemsNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, () => this.reset());
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js (223267 => 223268)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js 2017-10-13 00:41:45 UTC (rev 223267)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js 2017-10-13 00:47:51 UTC (rev 223268)
@@ -95,7 +95,7 @@
WI.resourceCachingDisabledSetting.addEventListener(WI.Setting.Event.Changed, this._resourceCachingDisabledSettingChanged, this);
}
- this._clearNetworkItemsNavigationItem = new WI.ButtonNavigationItem("clear-network-items", WI.UIString("Clear Network Items (%s)").format(WI.clearKeyboardShortcut.displayName), "Images/NavigationItemClear.svg", 16, 16);
+ this._clearNetworkItemsNavigationItem = new WI.ButtonNavigationItem("clear-network-items", WI.UIString("Clear Network Items (%s)").format(WI.clearKeyboardShortcut.displayName), "Images/NavigationItemTrash.svg", 15, 15);
this._clearNetworkItemsNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, () => this.reset());
WI.Frame.addEventListener(WI.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (223267 => 223268)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2017-10-13 00:41:45 UTC (rev 223267)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2017-10-13 00:47:51 UTC (rev 223268)
@@ -56,7 +56,7 @@
this._timelineContentBrowser.navigationBar.addNavigationItem(this._filterBarNavigationItem);
this.addSubview(this._timelineContentBrowser);
- this._clearTimelineNavigationItem = new WI.ButtonNavigationItem("clear-timeline", WI.UIString("Clear Timeline (%s)").format(WI.clearKeyboardShortcut.displayName), "Images/NavigationItemClear.svg", 16, 16);
+ this._clearTimelineNavigationItem = new WI.ButtonNavigationItem("clear-timeline", WI.UIString("Clear Timeline (%s)").format(WI.clearKeyboardShortcut.displayName), "Images/NavigationItemTrash.svg", 15, 15);
this._clearTimelineNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
this._clearTimelineNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._clearTimeline, this);
