<!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>[193319] branches/safari-601-branch/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/193319">193319</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:10:15 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192383">r192383</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceControllersDOMTreeManagerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceControllersJavaScriptLogViewControllerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceControllersRuntimeManagerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/RuntimeManager.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsConsoleCommandResultMessagejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ConsoleCommandResultMessage.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDOMTreeOutlinejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsLogContentViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193318 => 193319)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:10:08 UTC (rev 193318)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:10:15 UTC (rev 193319)
</span><span class="lines">@@ -1,5 +1,50 @@
</span><span class="cx"> 2015-12-03 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192383. rdar://problem/23221163
+
+ 2015-11-12 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Auto-log inspect node selected elements to the console
+ https://bugs.webkit.org/show_bug.cgi?id=151178
+
+ Reviewed by Brian Burg.
+
+ Auto-logging user selected elements to the console helps with
+ quick use in the console. $0 is not very discoverable, and $n
+ values are expendable. This also makes it convenient to use the
+ inspect node toolbar search option to select a few different
+ nodes and use each of them in the console without extra work.
+
+ * UserInterface/Controllers/DOMTreeManager.js:
+ (WebInspector.DOMTreeManager.prototype.inspectNodeObject.nodeAvailable):
+ (WebInspector.DOMTreeManager.prototype.inspectNodeObject):
+ Log selected nodes to the console. Treat this as a synthetic log that
+ will not immediately open the console like normal evaluation results.
+
+ * UserInterface/Controllers/JavaScriptLogViewController.js:
+ (WebInspector.JavaScriptLogViewController.prototype.appendImmediateExecutionWithResult.saveResultCallback):
+ (WebInspector.JavaScriptLogViewController.prototype.appendImmediateExecutionWithResult):
+ (WebInspector.JavaScriptLogViewController.prototype.consolePromptTextCommitted.printResult):
+ (WebInspector.JavaScriptLogViewController.prototype.consolePromptTextCommitted):
+ Initialize ConsoleCommandResultMessage's synthetic properties.
+
+ * UserInterface/Views/DOMTreeOutline.js:
+ (WebInspector.DOMTreeOutline.prototype._populateContextMenu.logElement):
+ (WebInspector.DOMTreeOutline.prototype._populateContextMenu):
+ * UserInterface/Controllers/RuntimeManager.js:
+ Create a global for the special "console" object group used in multiple places.
+
+ * UserInterface/Models/ConsoleCommandResultMessage.js:
+ (WebInspector.ConsoleCommandResultMessage):
+ (WebInspector.ConsoleCommandResultMessage.prototype.get synthetic):
+ Add a synthetic property.
+
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView.prototype.didAppendConsoleMessageView):
+ When the ConsoleResult is a synthetic result, do not auto-open the console.
+
+2015-12-03 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r192363. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-11-12 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersDOMTreeManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js (193318 => 193319)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2015-12-03 19:10:08 UTC (rev 193318)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2015-12-03 19:10:15 UTC (rev 193319)
</span><span class="lines">@@ -328,6 +328,16 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this.inspectElement(nodeId);
</span><ins>+
+ // Re-resolve the node in the console's object group when adding to the console.
+ var domNode = this.nodeForId(nodeId);
+ WebInspector.RemoteObject.resolveNode(domNode, WebInspector.RuntimeManager.ConsoleObjectGroup, function(remoteObject) {
+ if (!remoteObject)
+ return;
+ var specialLogStyles = true;
+ var synthetic = true;
+ WebInspector.consoleLogViewController.appendImmediateExecutionWithResult(WebInspector.UIString("Selected Element"), remoteObject, specialLogStyles, synthetic);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> remoteObject.pushNodeToFrontend(nodeAvailable.bind(this));
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersJavaScriptLogViewControllerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js (193318 => 193319)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js 2015-12-03 19:10:08 UTC (rev 193318)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js 2015-12-03 19:10:15 UTC (rev 193319)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> consoleSession.element.scrollIntoView();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- appendImmediateExecutionWithResult(text, result, addSpecialUserLogClass)
</del><ins>+ appendImmediateExecutionWithResult(text, result, addSpecialUserLogClass, synthetic)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(result instanceof WebInspector.RemoteObject);
</span><span class="cx">
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx">
</span><span class="cx"> function saveResultCallback(savedResultIndex)
</span><span class="cx"> {
</span><del>- var commandResultMessage = new WebInspector.ConsoleCommandResultMessage(result, false, savedResultIndex);
</del><ins>+ var commandResultMessage = new WebInspector.ConsoleCommandResultMessage(result, false, savedResultIndex, synthetic);
</ins><span class="cx"> var commandResultMessageView = new WebInspector.ConsoleMessageView(commandResultMessage);
</span><span class="cx"> this._appendConsoleMessageView(commandResultMessageView, true);
</span><span class="cx"> }
</span><span class="lines">@@ -224,12 +224,13 @@
</span><span class="cx"> if (!result || this._cleared)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var commandResultMessage = new WebInspector.ConsoleCommandResultMessage(result, wasThrown, savedResultIndex);
</del><ins>+ var synthetic = false;
+ var commandResultMessage = new WebInspector.ConsoleCommandResultMessage(result, wasThrown, savedResultIndex, synthetic);
</ins><span class="cx"> var commandResultMessageView = new WebInspector.ConsoleMessageView(commandResultMessage);
</span><span class="cx"> this._appendConsoleMessageView(commandResultMessageView, true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WebInspector.runtimeManager.evaluateInInspectedWindow(text, "console", true, false, false, true, true, printResult.bind(this));
</del><ins>+ WebInspector.runtimeManager.evaluateInInspectedWindow(text, WebInspector.RuntimeManager.ConsoleObjectGroup, true, false, false, true, true, printResult.bind(this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Private
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersRuntimeManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/RuntimeManager.js (193318 => 193319)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/RuntimeManager.js 2015-12-03 19:10:08 UTC (rev 193318)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/RuntimeManager.js 2015-12-03 19:10:15 UTC (rev 193319)
</span><span class="lines">@@ -112,3 +112,5 @@
</span><span class="cx"> WebInspector.RuntimeManager.Event = {
</span><span class="cx"> DidEvaluate: "runtime-manager-did-evaluate"
</span><span class="cx"> };
</span><ins>+
+WebInspector.RuntimeManager.ConsoleObjectGroup = "console";
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsConsoleCommandResultMessagejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ConsoleCommandResultMessage.js (193318 => 193319)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ConsoleCommandResultMessage.js 2015-12-03 19:10:08 UTC (rev 193318)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ConsoleCommandResultMessage.js 2015-12-03 19:10:15 UTC (rev 193319)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ConsoleCommandResultMessage = class ConsoleCommandResult extends WebInspector.ConsoleMessage
</span><span class="cx"> {
</span><del>- constructor(result, wasThrown, savedResultIndex)
</del><ins>+ constructor(result, wasThrown, savedResultIndex, synthetic)
</ins><span class="cx"> {
</span><span class="cx"> var source = WebInspector.ConsoleMessage.MessageSource.JS;
</span><span class="cx"> var level = (wasThrown ? WebInspector.ConsoleMessage.MessageLevel.Error : WebInspector.ConsoleMessage.MessageLevel.Log);
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> super(source, level, "", type, undefined, undefined, undefined, 0, [result], undefined, undefined);
</span><span class="cx">
</span><span class="cx"> this._savedResultIndex = savedResultIndex;
</span><ins>+ this._synthetic = synthetic || false;
</ins><span class="cx">
</span><span class="cx"> if (this._savedResultIndex && this._savedResultIndex > WebInspector.ConsoleCommandResultMessage.maximumSavedResultIndex)
</span><span class="cx"> WebInspector.ConsoleCommandResultMessage.maximumSavedResultIndex = this._savedResultIndex;
</span><span class="lines">@@ -56,6 +57,11 @@
</span><span class="cx"> {
</span><span class="cx"> return this._savedResultIndex;
</span><span class="cx"> }
</span><ins>+
+ get synthetic()
+ {
+ return this._synthetic;
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.ConsoleCommandResultMessage.maximumSavedResultIndex = 0;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDOMTreeOutlinejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js (193318 => 193319)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js 2015-12-03 19:10:08 UTC (rev 193318)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js 2015-12-03 19:10:15 UTC (rev 193319)
</span><span class="lines">@@ -509,7 +509,7 @@
</span><span class="cx">
</span><span class="cx"> function logElement()
</span><span class="cx"> {
</span><del>- WebInspector.RemoteObject.resolveNode(domNode, "console", function(remoteObject) {
</del><ins>+ WebInspector.RemoteObject.resolveNode(domNode, WebInspector.RuntimeManager.ConsoleObjectGroup, function(remoteObject) {
</ins><span class="cx"> if (!remoteObject)
</span><span class="cx"> return;
</span><span class="cx"> var text = WebInspector.UIString("Selected Element");
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsLogContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (193318 => 193319)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-12-03 19:10:08 UTC (rev 193318)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-12-03 19:10:15 UTC (rev 193319)
</span><span class="lines">@@ -155,9 +155,9 @@
</span><span class="cx"> // We want to remove focusable children after those pending dispatches too.
</span><span class="cx"> InspectorBackend.runAfterPendingDispatches(this._clearFocusableChildren.bind(this));
</span><span class="cx">
</span><del>- // We only auto show the console if the message is a result.
</del><ins>+ // We only auto show the console if the message is a non-synthetic result.
</ins><span class="cx"> // This is when the user evaluated something directly in the prompt.
</span><del>- if (type !== WebInspector.ConsoleMessage.MessageType.Result)
</del><ins>+ if (type !== WebInspector.ConsoleMessage.MessageType.Result || messageView.message.synthetic)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!WebInspector.isShowingConsoleTab())
</span></span></pre>
</div>
</div>
</body>
</html>