<!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>[186645] 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/186645">186645</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2015-07-09 16:21:11 -0700 (Thu, 09 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Don't clear the console when navigating to a different page
https://bugs.webkit.org/show_bug.cgi?id=142751
Reviewed by Timothy Hatcher.
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Controllers/LogManager.js:
(WebInspector.LogManager): No longer distinguishes from page refreshes and page navigations for console clearing.
(WebInspector.LogManager.prototype._delayedMessagesCleared):
(WebInspector.LogManager.prototype._mainResourceDidChange):
* UserInterface/Views/LogContentView.js:
(WebInspector.LogContentView.prototype._sessionStarted):
(WebInspector.LogContentView.prototype._handleContextMenuEvent): Changed context menu keep/clear log text.
(WebInspector.LogContentView.prototype._toggleClearLogOnNavigateSetting):
(WebInspector.LogContentView.prototype._toggleClearLogOnReloadSetting): Deleted.</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="#trunkSourceWebInspectorUIUserInterfaceControllersLogManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.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 (186644 => 186645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2015-07-09 23:02:41 UTC (rev 186644)
+++ trunk/Source/WebInspectorUI/ChangeLog        2015-07-09 23:21:11 UTC (rev 186645)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-07-09 Devin Rousso <drousso@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Don't clear the console when navigating to a different page
+ https://bugs.webkit.org/show_bug.cgi?id=142751
+
+ Reviewed by Timothy Hatcher.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Controllers/LogManager.js:
+ (WebInspector.LogManager): No longer distinguishes from page refreshes and page navigations for console clearing.
+ (WebInspector.LogManager.prototype._delayedMessagesCleared):
+ (WebInspector.LogManager.prototype._mainResourceDidChange):
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView.prototype._sessionStarted):
+ (WebInspector.LogContentView.prototype._handleContextMenuEvent): Changed context menu keep/clear log text.
+ (WebInspector.LogContentView.prototype._toggleClearLogOnNavigateSetting):
+ (WebInspector.LogContentView.prototype._toggleClearLogOnReloadSetting): Deleted.
+
+2015-07-09 Devin Rousso <drousso@apple.com>
+
</ins><span class="cx"> Web Inspector: Pseudo-element style ordering is wrong for pseudo-styles on unique selectors
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=146804
</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 (186644 => 186645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js        2015-07-09 23:02:41 UTC (rev 186644)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js        2015-07-09 23:21:11 UTC (rev 186645)
</span><span class="lines">@@ -91,7 +91,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><del>-localizedStrings["Clear Log on Reload"] = "Clear Log on Reload";
</del><ins>+localizedStrings["Clear Log on Navigation"] = "Clear Log on Navigation";
</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">@@ -284,7 +284,7 @@
</span><span class="cx"> localizedStrings["Invoke getter"] = "Invoke getter";
</span><span class="cx"> localizedStrings["JavaScript & Events"] = "JavaScript & Events";
</span><span class="cx"> localizedStrings["Jump to Definition"] = "Jump to Definition";
</span><del>-localizedStrings["Keep Log on Reload"] = "Keep Log on Reload";
</del><ins>+localizedStrings["Keep Log on Navigation"] = "Keep Log on Navigation";
</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="trunkSourceWebInspectorUIUserInterfaceControllersLogManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js (186644 => 186645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js        2015-07-09 23:02:41 UTC (rev 186644)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js        2015-07-09 23:21:11 UTC (rev 186645)
</span><span class="lines">@@ -31,9 +31,9 @@
</span><span class="cx"> super();
</span><span class="cx">
</span><span class="cx"> this._clearMessagesRequested = false;
</span><del>- this._isPageReload = false;
</del><ins>+ this._isNewPageOrReload = false;
</ins><span class="cx">
</span><del>- this.clearLogOnReloadSetting = new WebInspector.Setting("clear-log-on-reload", true);
</del><ins>+ this.clearLogOnNavigateSetting = new WebInspector.Setting("clear-log-on-navigate", true);
</ins><span class="cx">
</span><span class="cx"> WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
</span><span class="cx"> }
</span><span class="lines">@@ -74,14 +74,15 @@
</span><span class="cx">
</span><span class="cx"> _delayedMessagesCleared()
</span><span class="cx"> {
</span><del>- if (this._isPageReload) {
- this._isPageReload = false;
- if (this.clearLogOnReloadSetting.value)
- this.dispatchEventToListeners(WebInspector.LogManager.Event.Cleared);
- } else {
- // A frame navigated, console.clear() or command line clear() happened.
- this.dispatchEventToListeners(WebInspector.LogManager.Event.Cleared);
</del><ins>+ if (this._isNewPageOrReload) {
+ this._isNewPageOrReload = false;
+
+ if (!this.clearLogOnNavigateSetting.value)
+ return;
</ins><span class="cx"> }
</span><ins>+
+ // A console.clear() or command line clear() happened.
+ this.dispatchEventToListeners(WebInspector.LogManager.Event.Cleared);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> messageRepeatCountUpdated(count)
</span><span class="lines">@@ -107,11 +108,10 @@
</span><span class="cx"> if (!event.target.isMainFrame())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (event.data.oldMainResource.url === event.target.mainResource.url) {
- this._isPageReload = true;
</del><ins>+ this._isNewPageOrReload = true;
+
+ if (event.data.oldMainResource.url === event.target.mainResource.url)
</ins><span class="cx"> this.dispatchEventToListeners(WebInspector.LogManager.Event.SessionStarted);
</span><del>- } else
- this._isPageReload = false;
</del><span class="cx">
</span><span class="cx"> WebInspector.ConsoleCommandResultMessage.clearMaximumSavedResultIndex();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (186644 => 186645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js        2015-07-09 23:02:41 UTC (rev 186644)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js        2015-07-09 23:21:11 UTC (rev 186645)
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx">
</span><span class="cx"> _sessionStarted: function(event)
</span><span class="cx"> {
</span><del>- if (WebInspector.logManager.clearLogOnReloadSetting.value) {
</del><ins>+ if (WebInspector.logManager.clearLogOnNavigateSetting.value) {
</ins><span class="cx"> this._reappendProvisionalMessages();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -389,9 +389,9 @@
</span><span class="cx"> contextMenu.appendItem(WebInspector.UIString("Clear Log"), this._clearLog.bind(this));
</span><span class="cx"> contextMenu.appendSeparator();
</span><span class="cx">
</span><del>- var clearLogOnReloadUIString = WebInspector.logManager.clearLogOnReloadSetting.value ? WebInspector.UIString("Keep Log on Reload") : WebInspector.UIString("Clear Log on Reload");
</del><ins>+ var clearLogOnReloadUIString = WebInspector.logManager.clearLogOnNavigateSetting.value ? WebInspector.UIString("Keep Log on Navigation") : WebInspector.UIString("Clear Log on Navigation");
</ins><span class="cx">
</span><del>- contextMenu.appendItem(clearLogOnReloadUIString, this._toggleClearLogOnReloadSetting.bind(this));
</del><ins>+ contextMenu.appendItem(clearLogOnReloadUIString, this._toggleClearLogOnNavigateSetting.bind(this));
</ins><span class="cx">
</span><span class="cx"> contextMenu.show();
</span><span class="cx"> },
</span><span class="lines">@@ -679,9 +679,9 @@
</span><span class="cx"> WebInspector.showConsoleTab();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _toggleClearLogOnReloadSetting: function()
</del><ins>+ _toggleClearLogOnNavigateSetting: function()
</ins><span class="cx"> {
</span><del>- WebInspector.logManager.clearLogOnReloadSetting.value = !WebInspector.logManager.clearLogOnReloadSetting.value;
</del><ins>+ WebInspector.logManager.clearLogOnNavigateSetting.value = !WebInspector.logManager.clearLogOnNavigateSetting.value;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _clearLog: function()
</span></span></pre>
</div>
</div>
</body>
</html>