<!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>[180432] 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/180432">180432</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-20 11:35:27 -0800 (Fri, 20 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Add a setting for clearing the console on page reload
https://bugs.webkit.org/show_bug.cgi?id=134414
Patch by Ronald Jett <rjett@apple.com> on 2015-02-20
Reviewed by Timothy Hatcher.
Created a new setting "clear-log-on-reload", which defaults to true.
Users can toggle this setting with an item added to the console's context menu.
When enabled, the console will clear on page reload. When disabled, the console
content will remain during page reloads.
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Views/LogContentView.js:
(WebInspector.LogContentView):
(WebInspector.LogContentView.prototype._sessionStarted):
(WebInspector.LogContentView.prototype._handleContextMenuEvent):
(WebInspector.LogContentView.prototype._toggleClearLogOnReloadSetting):</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="#trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (180431 => 180432)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-02-20 19:32:06 UTC (rev 180431)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-02-20 19:35:27 UTC (rev 180432)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-02-20 Ronald Jett <rjett@apple.com>
+
+ Web Inspector: Add a setting for clearing the console on page reload
+ https://bugs.webkit.org/show_bug.cgi?id=134414
+
+ Reviewed by Timothy Hatcher.
+
+ Created a new setting "clear-log-on-reload", which defaults to true.
+ Users can toggle this setting with an item added to the console's context menu.
+ When enabled, the console will clear on page reload. When disabled, the console
+ content will remain during page reloads.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView):
+ (WebInspector.LogContentView.prototype._sessionStarted):
+ (WebInspector.LogContentView.prototype._handleContextMenuEvent):
+ (WebInspector.LogContentView.prototype._toggleClearLogOnReloadSetting):
+
</ins><span class="cx"> 2015-02-19 Saam Barati <saambarati1@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: merge in upstream Esprima to support parsing more of ES6
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (180431 => 180432)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-02-20 19:32:06 UTC (rev 180431)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-02-20 19:35:27 UTC (rev 180432)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> localizedStrings["Child Layers"] = "Child Layers";
</span><span class="cx"> localizedStrings["Children"] = "Children";
</span><span class="cx"> localizedStrings["Clear Log"] = "Clear Log";
</span><ins>+localizedStrings["Clear Log on Reload"] = "Clear Log on Reload";
</ins><span class="cx"> localizedStrings["Clear Timeline"] = "Clear Timeline";
</span><span class="cx"> localizedStrings["Clear log (%s or %s)"] = "Clear log (%s or %s)";
</span><span class="cx"> localizedStrings["Click Listener"] = "Click Listener";
</span><span class="lines">@@ -258,6 +259,7 @@
</span><span class="cx"> localizedStrings["Inspect"] = "Inspect";
</span><span class="cx"> localizedStrings["Invalid"] = "Invalid";
</span><span class="cx"> localizedStrings["JavaScript & Events"] = "JavaScript & Events";
</span><ins>+localizedStrings["Keep Log on Reload"] = "Keep Log on Reload";
</ins><span class="cx"> localizedStrings["Key"] = "Key";
</span><span class="cx"> localizedStrings["Label"] = "Label";
</span><span class="cx"> localizedStrings["Latency"] = "Latency";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (180431 => 180432)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-02-20 19:32:06 UTC (rev 180431)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-02-20 19:35:27 UTC (rev 180432)
</span><span class="lines">@@ -72,6 +72,8 @@
</span><span class="cx"> this._clearLogNavigationItem = new WebInspector.ButtonNavigationItem("clear-log", WebInspector.UIString("Clear log (%s or %s)").format(this._logViewController.messagesClearKeyboardShortcut.displayName, this._logViewController.messagesAlternateClearKeyboardShortcut.displayName), trashImage.src, trashImage.width, trashImage.height);
</span><span class="cx"> this._clearLogNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._clearLog, this);
</span><span class="cx">
</span><ins>+ this._clearLogOnReloadSetting = new WebInspector.Setting("clear-log-on-reload", true);
+
</ins><span class="cx"> var toolTip = WebInspector.UIString("Show split console");
</span><span class="cx"> var altToolTip = WebInspector.UIString("Show full-height console");
</span><span class="cx">
</span><span class="lines">@@ -301,6 +303,9 @@
</span><span class="cx">
</span><span class="cx"> _sessionStarted: function(event)
</span><span class="cx"> {
</span><ins>+ if (this._clearLogOnReloadSetting.value)
+ this._clearLog();
+
</ins><span class="cx"> this._logViewController.startNewSession();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -330,6 +335,12 @@
</span><span class="cx">
</span><span class="cx"> var contextMenu = new WebInspector.ContextMenu(event);
</span><span class="cx"> contextMenu.appendItem(WebInspector.UIString("Clear Log"), this._clearLog.bind(this));
</span><ins>+ contextMenu.appendSeparator();
+
+ var clearLogOnReloadUIString = this._clearLogOnReloadSetting.value ? WebInspector.UIString("Keep Log on Reload") : WebInspector.UIString("Clear Log on Reload");
+
+ contextMenu.appendItem(clearLogOnReloadUIString, this._toggleClearLogOnReloadSetting.bind(this));
+
</ins><span class="cx"> contextMenu.show();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -620,6 +631,11 @@
</span><span class="cx"> WebInspector.showSplitConsole();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ _toggleClearLogOnReloadSetting: function()
+ {
+ this._clearLogOnReloadSetting.value = !this._clearLogOnReloadSetting.value;
+ },
+
</ins><span class="cx"> _clearLog: function()
</span><span class="cx"> {
</span><span class="cx"> this._logViewController.clear();
</span></span></pre>
</div>
</div>
</body>
</html>