<!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>[182933] 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/182933">182933</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-16 18:00:21 -0700 (Thu, 16 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Should include "Log Value" context menu item in Preview and Collapsed ObjectTree
https://bugs.webkit.org/show_bug.cgi?id=143845
Reviewed by Timothy Hatcher.
Give previews the same "Log Value" context menu so that if you just log
a bunch of objects to the console you can quickly turn that entire object
into a $n reference in the console to interact with.
* UserInterface/Views/ObjectPreviewView.js:
(WebInspector.ObjectPreviewView.prototype.setOriginatingObjectInfo):
(WebInspector.ObjectPreviewView.prototype._contextMenuHandler):
Provide API to refer to a RemoteObject and optional PropertyPath
that can be used to give the preview a "Log Value" context menu.
* UserInterface/Views/ConsoleMessageView.js:
(WebInspector.ConsoleMessageView.prototype._appendFormattedArguments):
Include the RemoteObject without a path for a preview context menu.
* UserInterface/Views/ObjectTreeView.js:
(WebInspector.ObjectTreeView):
Include the RemoteObject with a path if we knew it for a preview context menu.
* UserInterface/Views/ObjectTreeBaseTreeElement.js:
(WebInspector.ObjectTreeBaseTreeElement.prototype.createGetterElement):
The context menu can never be empty, since we always added at least one item above.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectPreviewViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPreviewView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeBaseTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (182932 => 182933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-17 00:53:19 UTC (rev 182932)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-17 01:00:21 UTC (rev 182933)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2015-04-16 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Should include "Log Value" context menu item in Preview and Collapsed ObjectTree
+ https://bugs.webkit.org/show_bug.cgi?id=143845
+
+ Reviewed by Timothy Hatcher.
+
+ Give previews the same "Log Value" context menu so that if you just log
+ a bunch of objects to the console you can quickly turn that entire object
+ into a $n reference in the console to interact with.
+
+ * UserInterface/Views/ObjectPreviewView.js:
+ (WebInspector.ObjectPreviewView.prototype.setOriginatingObjectInfo):
+ (WebInspector.ObjectPreviewView.prototype._contextMenuHandler):
+ Provide API to refer to a RemoteObject and optional PropertyPath
+ that can be used to give the preview a "Log Value" context menu.
+
+ * UserInterface/Views/ConsoleMessageView.js:
+ (WebInspector.ConsoleMessageView.prototype._appendFormattedArguments):
+ Include the RemoteObject without a path for a preview context menu.
+
+ * UserInterface/Views/ObjectTreeView.js:
+ (WebInspector.ObjectTreeView):
+ Include the RemoteObject with a path if we knew it for a preview context menu.
+
+ * UserInterface/Views/ObjectTreeBaseTreeElement.js:
+ (WebInspector.ObjectTreeBaseTreeElement.prototype.createGetterElement):
+ The context menu can never be empty, since we always added at least one item above.
+
+
+2015-04-16 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: "Log Value" of a value inside of an array, does not log the innermost value
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143793
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (182932 => 182933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-04-17 00:53:19 UTC (rev 182932)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-04-17 01:00:21 UTC (rev 182933)
</span><span class="lines">@@ -390,6 +390,10 @@
</span><span class="cx"> var parameter = parameters[0];
</span><span class="cx"> var preview = WebInspector.FormattedValue.createObjectPreviewOrFormattedValueForRemoteObject(parameter, WebInspector.ObjectPreviewView.Mode.Brief);
</span><span class="cx"> var isPreviewView = preview instanceof WebInspector.ObjectPreviewView;
</span><ins>+
+ if (isPreviewView)
+ preview.setOriginatingObjectInfo(parameter, null);
+
</ins><span class="cx"> var previewElement = isPreviewView ? preview.element : preview;
</span><span class="cx"> previewContainer.appendChild(previewElement);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectPreviewViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPreviewView.js (182932 => 182933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPreviewView.js 2015-04-17 00:53:19 UTC (rev 182932)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPreviewView.js 2015-04-17 01:00:21 UTC (rev 182933)
</span><span class="lines">@@ -90,6 +90,18 @@
</span><span class="cx"> this._previewElement.hidden = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ setOriginatingObjectInfo(remoteObject, propertyPath)
+ {
+ console.assert(!this._remoteObject);
+ console.assert(remoteObject instanceof WebInspector.RemoteObject);
+ console.assert(!propertyPath || propertyPath instanceof WebInspector.PropertyPath);
+
+ this._remoteObject = remoteObject;
+ this._propertyPath = propertyPath || null;
+
+ this.element.addEventListener("contextmenu", this._contextMenuHandler.bind(this));
+ }
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _initTitleElement()
</span><span class="lines">@@ -223,6 +235,24 @@
</span><span class="cx"> element.appendChild(WebInspector.FormattedValue.createElementForObjectPreview(preview));
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+
+ _contextMenuHandler(event)
+ {
+ var contextMenu = new WebInspector.ContextMenu(event);
+
+ contextMenu.appendItem(WebInspector.UIString("Log Value"), function() {
+ var remoteObject = this._remoteObject;
+ var isImpossible = !this._propertyPath || this._propertyPath.isFullPathImpossible();
+ var text = isImpossible ? WebInspector.UIString("Selected Value") : this._propertyPath.displayPath(WebInspector.PropertyPath.Type.Value);
+
+ if (!isImpossible)
+ WebInspector.quickConsole.prompt.pushHistoryItem(text);
+
+ WebInspector.consoleLogViewController.appendImmediateExecutionWithResult(text, this._remoteObject);
+ }.bind(this));
+
+ contextMenu.show();
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.ObjectPreviewView.Mode = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeBaseTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js (182932 => 182933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js 2015-04-17 00:53:19 UTC (rev 182932)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js 2015-04-17 01:00:21 UTC (rev 182933)
</span><span class="lines">@@ -204,8 +204,7 @@
</span><span class="cx">
</span><span class="cx"> this._appendMenusItemsForObject(contextMenu, resolvedValue);
</span><span class="cx">
</span><del>- if (!contextMenu.isEmpty())
- contextMenu.show();
</del><ins>+ contextMenu.show();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _appendMenusItemsForObject(contextMenu, resolvedValue)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js (182932 => 182933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js 2015-04-17 00:53:19 UTC (rev 182932)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js 2015-04-17 01:00:21 UTC (rev 182933)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> console.assert(object instanceof WebInspector.RemoteObject);
</span><span class="cx"> console.assert(!propertyPath || propertyPath instanceof WebInspector.PropertyPath);
</span><span class="cx">
</span><ins>+ var providedPropertyPath = propertyPath instanceof WebInspector.PropertyPath;
+
</ins><span class="cx"> this._object = object;
</span><span class="cx"> this._mode = mode || WebInspector.ObjectTreeView.defaultModeForObject(object);
</span><span class="cx"> this._propertyPath = propertyPath || new WebInspector.PropertyPath(this._object, "this");
</span><span class="lines">@@ -52,6 +54,7 @@
</span><span class="cx">
</span><span class="cx"> if (this._object.preview) {
</span><span class="cx"> this._previewView = new WebInspector.ObjectPreviewView(this._object.preview);
</span><ins>+ this._previewView.setOriginatingObjectInfo(this._object, providedPropertyPath ? propertyPath : null);
</ins><span class="cx"> this._previewView.element.addEventListener("click", this._handlePreviewOrTitleElementClick.bind(this));
</span><span class="cx"> this._element.appendChild(this._previewView.element);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>