Modified: trunk/Source/WebInspectorUI/ChangeLog (225256 => 225257)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-11-29 04:44:50 UTC (rev 225256)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-11-29 05:08:21 UTC (rev 225257)
@@ -1,5 +1,20 @@
2017-11-28 Joseph Pecoraro <[email protected]>
+ Web Inspector: Move console Preserve Log setting from Setting tab to Console navigation bar
+ https://bugs.webkit.org/show_bug.cgi?id=180125
+
+ Reviewed by Matt Baker.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Views/LogContentView.js:
+ (WI.LogContentView):
+ (WI.LogContentView.prototype.get navigationItems):
+ (WI.LogContentView.prototype._clearLogOnNavigateSettingChanged):
+ * UserInterface/Views/SettingsTabContentView.js:
+ (WI.SettingsTabContentView.prototype._createGeneralSettingsView):
+
+2017-11-28 Joseph Pecoraro <[email protected]>
+
Web Inspector: Remove Network "Clear on load" from Settings tab now that Network tab has a toggle for it
https://bugs.webkit.org/show_bug.cgi?id=180123
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (225256 => 225257)
--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-11-29 04:44:50 UTC (rev 225256)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-11-29 05:08:21 UTC (rev 225257)
@@ -196,7 +196,6 @@
localizedStrings["Clear object store"] = "Clear object store";
localizedStrings["Clear samples"] = "Clear samples";
localizedStrings["Clear watch expressions"] = "Clear watch expressions";
-localizedStrings["Clear when page loads"] = "Clear when page loads";
localizedStrings["Click Listener"] = "Click Listener";
localizedStrings["Click to close this tab; Option-click to close all tabs except this one"] = "Click to close this tab; Option-click to close all tabs except this one";
localizedStrings["Click to link property values"] = "Click to link property values";
@@ -239,7 +238,6 @@
localizedStrings["Console Profile Recorded"] = "Console Profile Recorded";
localizedStrings["Console cleared at %s"] = "Console cleared at %s";
localizedStrings["Console opened at %s"] = "Console opened at %s";
-localizedStrings["Console:"] = "Console:";
localizedStrings["Containing"] = "Containing";
localizedStrings["Content"] = "Content";
localizedStrings["Content Security Policy violation of directive: %s"] = "Content Security Policy violation of directive: %s";
@@ -308,6 +306,7 @@
localizedStrings["Display"] = "Display";
localizedStrings["Displayed Columns"] = "Displayed Columns";
localizedStrings["Do not clear network items on new page loads"] = "Do not clear network items on new page loads";
+localizedStrings["Do not clear the console on new page loads"] = "Do not clear the console on new page loads";
localizedStrings["Do not fade unexecuted code"] = "Do not fade unexecuted code";
localizedStrings["Dock to bottom of window"] = "Dock to bottom of window";
localizedStrings["Dock to side of window"] = "Dock to side of window";
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (225256 => 225257)
--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2017-11-29 04:44:50 UTC (rev 225256)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2017-11-29 05:08:21 UTC (rev 225257)
@@ -66,7 +66,14 @@
this._selectedSearchMatch = null;
this._selectedSearchMatchIsValid = false;
- var scopeBarItems = [
+ this._preserveLogNavigationItem = new WI.CheckboxNavigationItem("perserve-log", WI.UIString("Preserve Log"), !WI.settings.clearLogOnNavigate.value);
+ this._preserveLogNavigationItem.tooltip = WI.UIString("Do not clear the console on new page loads");
+ this._preserveLogNavigationItem.addEventListener(WI.CheckboxNavigationItem.Event.CheckedDidChange, () => { WI.settings.clearLogOnNavigate.value = !WI.settings.clearLogOnNavigate.value; });
+ WI.settings.clearLogOnNavigate.addEventListener(WI.Setting.Event.Changed, this._clearLogOnNavigateSettingChanged, this);
+
+ this._checkboxsNavigationItemGroup = new WI.GroupNavigationItem([this._preserveLogNavigationItem, new WI.DividerNavigationItem]);
+
+ let scopeBarItems = [
new WI.ScopeBarItem(WI.LogContentView.Scopes.All, WI.UIString("All"), true),
new WI.ScopeBarItem(WI.LogContentView.Scopes.Errors, WI.UIString("Errors"), false, "errors"),
new WI.ScopeBarItem(WI.LogContentView.Scopes.Warnings, WI.UIString("Warnings"), false, "warnings"),
@@ -119,17 +126,18 @@
let navigationItems = [this._scopeBar, new WI.DividerNavigationItem];
if (this._hasNonDefaultLogChannelMessage && this._messageSourceBar)
- navigationItems.push(this._messageSourceBar);
+ navigationItems.push(this._messageSourceBar, new WI.DividerNavigationItem);
if (HeapAgent.gc)
navigationItems.push(this._garbageCollectNavigationItem);
navigationItems.push(this._clearLogNavigationItem);
- if (WI.isShowingSplitConsole()) {
- navigationItems.push(new WI.DividerNavigationItem);
- navigationItems.push(this._showConsoleTabNavigationItem);
- } else if (WI.isShowingConsoleTab())
- navigationItems.unshift(this._findBanner);
+
+ if (WI.isShowingSplitConsole())
+ navigationItems.push(new WI.DividerNavigationItem, this._showConsoleTabNavigationItem);
+ else if (WI.isShowingConsoleTab())
+ navigationItems.unshift(this._findBanner, this._checkboxsNavigationItemGroup);
+
return navigationItems;
}
@@ -834,6 +842,11 @@
this.performSearch(this._currentSearchQuery);
}
+ _clearLogOnNavigateSettingChanged()
+ {
+ this._preserveLogNavigationItem.checked = !WI.settings.clearLogOnNavigate.value;
+ }
+
_keyDown(event)
{
let isRTL = WI.resolvedLayoutDirection() === WI.LayoutDirection.RTL;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js (225256 => 225257)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js 2017-11-29 04:44:50 UTC (rev 225256)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js 2017-11-29 05:08:21 UTC (rev 225257)
@@ -202,10 +202,6 @@
generalSettingsView.addSeparator();
- generalSettingsView.addSetting(WI.UIString("Console:"), WI.settings.clearLogOnNavigate, WI.UIString("Clear when page loads"));
-
- generalSettingsView.addSeparator();
-
generalSettingsView.addSetting(WI.UIString("Debugger:"), WI.settings.showScopeChainOnPause, WI.UIString("Show Scope Chain on pause"));
generalSettingsView.addSeparator();
