<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[210793] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/210793">210793</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-16 16:04:15 -0800 (Mon, 16 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: add "Persist Logs on Navigation" to settings screen
https://bugs.webkit.org/show_bug.cgi?id=166992
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2017-01-16
Reviewed by Brian Burg.
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Base/Setting.js:
* UserInterface/Controllers/LogManager.js:
(WebInspector.LogManager):
(WebInspector.LogManager.prototype._delayedMessagesCleared):
* UserInterface/Views/LogContentView.js:
(WebInspector.LogContentView.prototype._sessionStarted):
(WebInspector.LogContentView.prototype._handleContextMenuEvent):
(WebInspector.LogContentView.prototype._toggleClearLogOnNavigateSetting):
Move setting and UI toggle for "Keep Log on Navigation" to the global settings dictionary
and content view.
* UserInterface/Views/SettingsTabContentView.js:
(WebInspector.SettingsTabContentView.prototype.initialLayout):
(WebInspector.SettingsTabContentView):
Add checkbox for new setting and spacer between text settings and log settings.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseSettingjs">trunk/Source/WebInspectorUI/UserInterface/Base/Setting.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersLogManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSettingsTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (210792 => 210793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-01-16 23:15:26 UTC (rev 210792)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-01-17 00:04:15 UTC (rev 210793)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2017-01-16 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><ins>+ Web Inspector: add "Persist Logs on Navigation" to settings screen
+ https://bugs.webkit.org/show_bug.cgi?id=166992
+
+ Reviewed by Brian Burg.
+
+ * Localizations/en.lproj/localizedStrings.js:
+
+ * UserInterface/Base/Setting.js:
+ * UserInterface/Controllers/LogManager.js:
+ (WebInspector.LogManager):
+ (WebInspector.LogManager.prototype._delayedMessagesCleared):
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView.prototype._sessionStarted):
+ (WebInspector.LogContentView.prototype._handleContextMenuEvent):
+ (WebInspector.LogContentView.prototype._toggleClearLogOnNavigateSetting):
+ Move setting and UI toggle for "Keep Log on Navigation" to the global settings dictionary
+ and content view.
+
+ * UserInterface/Views/SettingsTabContentView.js:
+ (WebInspector.SettingsTabContentView.prototype.initialLayout):
+ (WebInspector.SettingsTabContentView):
+ Add checkbox for new setting and spacer between text settings and log settings.
+
+2017-01-16 Devin Rousso <dcrousso+webkit@gmail.com>
+
</ins><span class="cx"> Web Inspector: add UI Zoom level to Settings screen
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=166991
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (210792 => 210793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-01-16 23:15:26 UTC (rev 210792)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-01-17 00:04:15 UTC (rev 210793)
</span><span class="lines">@@ -145,7 +145,6 @@
</span><span class="cx"> localizedStrings["Classes"] = "Classes";
</span><span class="cx"> localizedStrings["Clear"] = "Clear";
</span><span class="cx"> localizedStrings["Clear Log"] = "Clear Log";
</span><del>-localizedStrings["Clear Log on Navigation"] = "Clear Log on Navigation";
</del><span class="cx"> localizedStrings["Clear Network Items"] = "Clear Network Items";
</span><span class="cx"> localizedStrings["Clear Timeline"] = "Clear Timeline";
</span><span class="cx"> localizedStrings["Clear focus"] = "Clear focus";
</span><span class="lines">@@ -153,6 +152,7 @@
</span><span class="cx"> localizedStrings["Clear object store"] = "Clear object store";
</span><span class="cx"> localizedStrings["Clear samples"] = "Clear samples";
</span><span class="cx"> localizedStrings["Clear watch expressions"] = "Clear watch expressions";
</span><ins>+localizedStrings["Clear when page navigates"] = "Clear when page navigates";
</ins><span class="cx"> localizedStrings["Click Listener"] = "Click Listener";
</span><span class="cx"> localizedStrings["Click to add a new rule."] = "Click to add a new rule.";
</span><span class="cx"> localizedStrings["Click to clear modified properties"] = "Click to clear modified properties";
</span><span class="lines">@@ -199,6 +199,7 @@
</span><span class="cx"> localizedStrings["Console logs, click to show the Console tab"] = "Console logs, click to show the Console tab";
</span><span class="cx"> localizedStrings["Console opened at %s"] = "Console opened at %s";
</span><span class="cx"> localizedStrings["Console warnings, click to show the Console tab"] = "Console warnings, click to show the Console tab";
</span><ins>+localizedStrings["Console:"] = "Console:";
</ins><span class="cx"> localizedStrings["Container Regions"] = "Container Regions";
</span><span class="cx"> localizedStrings["Content"] = "Content";
</span><span class="cx"> localizedStrings["Content Flow"] = "Content Flow";
</span><span class="lines">@@ -448,7 +449,6 @@
</span><span class="cx"> localizedStrings["JavaScript Context"] = "JavaScript Context";
</span><span class="cx"> localizedStrings["Join"] = "Join";
</span><span class="cx"> localizedStrings["Jump to Definition"] = "Jump to Definition";
</span><del>-localizedStrings["Keep Log on Navigation"] = "Keep Log on Navigation";
</del><span class="cx"> localizedStrings["Key"] = "Key";
</span><span class="cx"> localizedStrings["Key Path"] = "Key Path";
</span><span class="cx"> localizedStrings["Label"] = "Label";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseSettingjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Setting.js (210792 => 210793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Setting.js 2017-01-16 23:15:26 UTC (rev 210792)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Setting.js 2017-01-17 00:04:15 UTC (rev 210793)
</span><span class="lines">@@ -109,5 +109,6 @@
</span><span class="cx"> indentWithTabs: new WebInspector.Setting("indent-with-tabs", false),
</span><span class="cx"> showWhitespaceCharacters: new WebInspector.Setting("show-whitespace-characters", false),
</span><span class="cx"> showInvalidCharacters: new WebInspector.Setting("show-invalid-characters", false),
</span><ins>+ clearLogOnNavigate: new WebInspector.Setting("clear-log-on-navigate", true),
</ins><span class="cx"> zoomFactor: new WebInspector.Setting("zoom-factor", 1),
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersLogManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js (210792 => 210793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js 2017-01-16 23:15:26 UTC (rev 210792)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js 2017-01-17 00:04:15 UTC (rev 210793)
</span><span class="lines">@@ -33,8 +33,6 @@
</span><span class="cx"> this._clearMessagesRequested = false;
</span><span class="cx"> this._isNewPageOrReload = false;
</span><span class="cx">
</span><del>- this.clearLogOnNavigateSetting = new WebInspector.Setting("clear-log-on-navigate", true);
-
</del><span class="cx"> WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -81,7 +79,7 @@
</span><span class="cx"> if (this._isNewPageOrReload) {
</span><span class="cx"> this._isNewPageOrReload = false;
</span><span class="cx">
</span><del>- if (!this.clearLogOnNavigateSetting.value)
</del><ins>+ if (!WebInspector.settings.clearLogOnNavigate.value)
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (210792 => 210793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2017-01-16 23:15:26 UTC (rev 210792)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2017-01-17 00:04:15 UTC (rev 210793)
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx">
</span><span class="cx"> _sessionStarted(event)
</span><span class="cx"> {
</span><del>- if (WebInspector.logManager.clearLogOnNavigateSetting.value) {
</del><ins>+ if (WebInspector.settings.clearLogOnNavigate.value) {
</ins><span class="cx"> this._reappendProvisionalMessages();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -373,9 +373,6 @@
</span><span class="cx">
</span><span class="cx"> contextMenu.appendItem(WebInspector.UIString("Clear Log"), this._clearLog.bind(this));
</span><span class="cx"> contextMenu.appendSeparator();
</span><del>-
- let clearLogOnReloadUIString = WebInspector.logManager.clearLogOnNavigateSetting.value ? WebInspector.UIString("Keep Log on Navigation") : WebInspector.UIString("Clear Log on Navigation");
- contextMenu.appendItem(clearLogOnReloadUIString, this._toggleClearLogOnNavigateSetting.bind(this));
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _mousedown(event)
</span><span class="lines">@@ -665,11 +662,6 @@
</span><span class="cx"> WebInspector.showConsoleTab();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _toggleClearLogOnNavigateSetting()
- {
- WebInspector.logManager.clearLogOnNavigateSetting.value = !WebInspector.logManager.clearLogOnNavigateSetting.value;
- }
-
</del><span class="cx"> _clearLog()
</span><span class="cx"> {
</span><span class="cx"> WebInspector.logManager.requestClearMessages();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSettingsTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js (210792 => 210793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js 2017-01-16 23:15:26 UTC (rev 210792)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js 2017-01-17 00:04:15 UTC (rev 210793)
</span><span class="lines">@@ -152,6 +152,15 @@
</span><span class="cx">
</span><span class="cx"> this.element.appendChild(document.createElement("br"));
</span><span class="cx">
</span><ins>+ createContainer(WebInspector.UIString("Console:"), (valueControllerContainer) => {
+ let checkbox = createCheckbox(WebInspector.settings.clearLogOnNavigate);
+ valueControllerContainer.appendChild(checkbox);
+
+ valueControllerContainer.append(WebInspector.UIString("Clear when page navigates"));
+ });
+
+ this.element.appendChild(document.createElement("br"));
+
</ins><span class="cx"> createContainer(WebInspector.UIString("Zoom:"), (valueControllerContainer) => {
</span><span class="cx"> let select = valueControllerContainer.createChild("select");
</span><span class="cx"> select.addEventListener("change", (event) => {
</span></span></pre>
</div>
</div>
</body>
</html>