<!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>[185911] 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/185911">185911</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-24 08:32:32 -0700 (Wed, 24 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Right/Left arrow no longer works in console to expand/collapse ObjectTrees
https://bugs.webkit.org/show_bug.cgi?id=141949
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-06-24
Reviewed by Timothy Hatcher.
* UserInterface/Views/ConsoleMessageView.js:
(WebInspector.ConsoleMessageView):
(WebInspector.ConsoleMessageView.prototype.get expandable):
(WebInspector.ConsoleMessageView.prototype.set expandable): Deleted.
(WebInspector.ConsoleMessageView.prototype._appendExtraParameters):
(WebInspector.ConsoleMessageView.prototype._appendStackTrace):
(WebInspector.ConsoleMessageView.prototype._makeExpandable):
Clarify what makes a ConsoleMessageView expandable or not.
(WebInspector.ConsoleMessageView.prototype.expand):
(WebInspector.ConsoleMessageView.prototype.collapse):
Handle the expand/collapse cases which could apply to the
ConsoleMessageView itself or an inner ObjectTreeView if that is all we contain.
(WebInspector.ConsoleMessageView.prototype._formatParameterAsObject):
Delete out of date comment. A console.log("message", obj) will want the
object tree member variable to handle auto expanding/collapsing of the
single object in the message.
* UserInterface/Views/LogContentView.js:
(WebInspector.LogContentView.prototype._leftArrowWasPressed):
(WebInspector.LogContentView.prototype._rightArrowWasPressed):
Use the higher level ConsoleMessageView objects accessible from the element
to call through to expand/collapse.</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="#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 (185910 => 185911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-06-24 14:47:04 UTC (rev 185910)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-06-24 15:32:32 UTC (rev 185911)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-06-24 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Right/Left arrow no longer works in console to expand/collapse ObjectTrees
+ https://bugs.webkit.org/show_bug.cgi?id=141949
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/ConsoleMessageView.js:
+ (WebInspector.ConsoleMessageView):
+ (WebInspector.ConsoleMessageView.prototype.get expandable):
+ (WebInspector.ConsoleMessageView.prototype.set expandable): Deleted.
+ (WebInspector.ConsoleMessageView.prototype._appendExtraParameters):
+ (WebInspector.ConsoleMessageView.prototype._appendStackTrace):
+ (WebInspector.ConsoleMessageView.prototype._makeExpandable):
+ Clarify what makes a ConsoleMessageView expandable or not.
+
+ (WebInspector.ConsoleMessageView.prototype.expand):
+ (WebInspector.ConsoleMessageView.prototype.collapse):
+ Handle the expand/collapse cases which could apply to the
+ ConsoleMessageView itself or an inner ObjectTreeView if that is all we contain.
+
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsObject):
+ Delete out of date comment. A console.log("message", obj) will want the
+ object tree member variable to handle auto expanding/collapsing of the
+ single object in the message.
+
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView.prototype._leftArrowWasPressed):
+ (WebInspector.LogContentView.prototype._rightArrowWasPressed):
+ Use the higher level ConsoleMessageView objects accessible from the element
+ to call through to expand/collapse.
+
</ins><span class="cx"> 2015-06-23 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Reduce QuickConsole DidResize events if it did not change
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (185910 => 185911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-06-24 14:47:04 UTC (rev 185910)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-06-24 15:32:32 UTC (rev 185911)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx">
</span><span class="cx"> this._message = message;
</span><span class="cx">
</span><ins>+ this._expandable = false;
+
</ins><span class="cx"> this._element = document.createElement("div");
</span><span class="cx"> this._element.classList.add("console-message");
</span><span class="cx">
</span><span class="lines">@@ -141,37 +143,39 @@
</span><span class="cx">
</span><span class="cx"> get expandable()
</span><span class="cx"> {
</span><del>- return this._element.classList.contains("expandable");
- }
</del><ins>+ // There are extra arguments or a call stack that can be shown.
+ if (this._expandable)
+ return true;
</ins><span class="cx">
</span><del>- set expandable(x)
- {
- if (x === this.expandable)
- return;
</del><ins>+ // There is an object tree that could be expanded.
+ if (this._objectTree)
+ return true;
</ins><span class="cx">
</span><del>- if (!this._boundClickHandler)
- this._boundClickHandler = this.toggle.bind(this);
-
- var becameExpandable = this._element.classList.toggle("expandable", x);
-
- if (becameExpandable)
- this._messageTextElement.addEventListener("click", this._boundClickHandler);
- else
- this._messageTextElement.removeEventListener("click", this._boundClickHandler);
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> expand()
</span><span class="cx"> {
</span><del>- this._element.classList.add("expanded");
</del><ins>+ if (this._expandable)
+ this._element.classList.add("expanded");
</ins><span class="cx">
</span><span class="cx"> // Auto-expand an inner object tree if there is a single object.
</span><del>- if (this._objectTree && this._extraParameters.length === 1)
- this._objectTree.expand();
</del><ins>+ if (this._objectTree) {
+ if (!this._extraParameters || this._extraParameters.length <= 1)
+ this._objectTree.expand();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> collapse()
</span><span class="cx"> {
</span><del>- this._element.classList.remove("expanded");
</del><ins>+ if (this._expandable)
+ this._element.classList.remove("expanded");
+
+ // Collapse the object tree just in cases where it was autoexpanded.
+ if (this._objectTree) {
+ if (!this._extraParameters || this._extraParameters.length <= 1)
+ this._objectTree.collapse();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> toggle()
</span><span class="lines">@@ -314,7 +318,7 @@
</span><span class="cx"> if (!this._extraParameters || !this._extraParameters.length)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- this.expandable = true;
</del><ins>+ this._makeExpandable();
</ins><span class="cx">
</span><span class="cx"> // Auto-expand if there are multiple objects.
</span><span class="cx"> if (this._extraParameters.length > 1)
</span><span class="lines">@@ -336,7 +340,7 @@
</span><span class="cx"> if (!this._shouldShowStackTrace())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- this.expandable = true;
</del><ins>+ this._makeExpandable();
</ins><span class="cx">
</span><span class="cx"> // Auto-expand for console.trace.
</span><span class="cx"> if (this._message.type === WebInspector.ConsoleMessage.MessageType.Trace)
</span><span class="lines">@@ -484,7 +488,6 @@
</span><span class="cx"> _formatParameterAsObject(object, element, forceExpansion)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Should have a better ObjectTreeView mode for classes (static methods and methods).
</span><del>- // FIXME: Only need to assign to objectTree if this is a ConsoleMessageResult. We should assert that.
</del><span class="cx"> this._objectTree = new WebInspector.ObjectTreeView(object, null, this._rootPropertyPathForObject(object), forceExpansion);
</span><span class="cx"> element.appendChild(this._objectTree.element);
</span><span class="cx"> }
</span><span class="lines">@@ -776,4 +779,17 @@
</span><span class="cx">
</span><span class="cx"> return "[" + this._levelString() + "] ";
</span><span class="cx"> }
</span><ins>+
+ _makeExpandable()
+ {
+ if (this._expandable)
+ return;
+
+ this._expandable = true;
+
+ this._element.classList.add("expandable");
+
+ this._boundClickHandler = this.toggle.bind(this);
+ this._messageTextElement.addEventListener("click", this._boundClickHandler);
+ }
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (185910 => 185911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-06-24 14:47:04 UTC (rev 185910)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-06-24 15:32:32 UTC (rev 185911)
</span><span class="lines">@@ -786,11 +786,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var currentMessage = this._selectedMessages[0];
</span><del>- if (currentMessage.classList.contains("console-group-title"))
</del><ins>+ if (currentMessage.classList.contains("console-group-title")) {
</ins><span class="cx"> currentMessage.parentNode.classList.add("collapsed");
</span><del>- else {
- // FIXME: Web Inspector: Right/Left arrow no longer works in console to expand/collapse ConsoleMessages
- // FIXME: <https://webkit.org/b/141949> Web Inspector: Right/Left arrow no longer works in console to expand/collapse ObjectTrees
</del><ins>+ event.preventDefault();
+ } else if (currentMessage.__messageView && currentMessage.__messageView.expandable) {
+ currentMessage.__messageView.collapse();
+ event.preventDefault();
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -800,11 +801,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var currentMessage = this._selectedMessages[0];
</span><del>- if (currentMessage.classList.contains("console-group-title"))
</del><ins>+ if (currentMessage.classList.contains("console-group-title")) {
</ins><span class="cx"> currentMessage.parentNode.classList.remove("collapsed");
</span><del>- else {
- // FIXME: Web Inspector: Right/Left arrow no longer works in console to expand/collapse ConsoleMessages
- // FIXME: <https://webkit.org/b/141949> Web Inspector: Right/Left arrow no longer works in console to expand/collapse ObjectTrees
</del><ins>+ event.preventDefault();
+ } else if (currentMessage.__messageView && currentMessage.__messageView.expandable) {
+ currentMessage.__messageView.expand();
+ event.preventDefault();
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>