<!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>[180485] 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/180485">180485</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-22 08:47:54 -0800 (Sun, 22 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Give ObjectPreviewView a showTitle/showPreview toggle
https://bugs.webkit.org/show_bug.cgi?id=141874
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-02-22
Reviewed by Timothy Hatcher.
Refactor ObjectTree/ObjectPreview a bit to make it easier
to use expanding/collapsing previews in other places.
* UserInterface/Views/ObjectPreviewView.js:
(WebInspector.ObjectPreviewView):
(WebInspector.ObjectPreviewView.prototype.showTitle):
(WebInspector.ObjectPreviewView.prototype.showPreview):
Maintain both a titleElement and previewElement. Show only
one at a time based on showTitle/showPreview APIs.
* UserInterface/Views/ObjectTreeView.css:
(.object-tree.expanded .object-preview):
* UserInterface/Views/ObjectTreeView.js:
(WebInspector.ObjectTreeView):
(WebInspector.ObjectTreeView.prototype.expand):
(WebInspector.ObjectTreeView.prototype.collapse):
If we have a preview, let PreviewView handle toggling
between a title and preview display.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectPreviewViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPreviewView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.css</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 (180484 => 180485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-02-22 16:43:32 UTC (rev 180484)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-02-22 16:47:54 UTC (rev 180485)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-02-22 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Give ObjectPreviewView a showTitle/showPreview toggle
+ https://bugs.webkit.org/show_bug.cgi?id=141874
+
+ Reviewed by Timothy Hatcher.
+
+ Refactor ObjectTree/ObjectPreview a bit to make it easier
+ to use expanding/collapsing previews in other places.
+
+ * UserInterface/Views/ObjectPreviewView.js:
+ (WebInspector.ObjectPreviewView):
+ (WebInspector.ObjectPreviewView.prototype.showTitle):
+ (WebInspector.ObjectPreviewView.prototype.showPreview):
+ Maintain both a titleElement and previewElement. Show only
+ one at a time based on showTitle/showPreview APIs.
+
+ * UserInterface/Views/ObjectTreeView.css:
+ (.object-tree.expanded .object-preview):
+ * UserInterface/Views/ObjectTreeView.js:
+ (WebInspector.ObjectTreeView):
+ (WebInspector.ObjectTreeView.prototype.expand):
+ (WebInspector.ObjectTreeView.prototype.collapse):
+ If we have a preview, let PreviewView handle toggling
+ between a title and preview display.
+
+2015-02-22 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Make Console UI icons / lines slightly larger
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141876
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectPreviewViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPreviewView.js (180484 => 180485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPreviewView.js 2015-02-22 16:43:32 UTC (rev 180484)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPreviewView.js 2015-02-22 16:47:54 UTC (rev 180485)
</span><span class="lines">@@ -34,8 +34,16 @@
</span><span class="cx">
</span><span class="cx"> this._element = document.createElement("span");
</span><span class="cx"> this._element.className = "object-preview";
</span><del>- this._lossless = this._appendPreview(this._element, this._preview);
</del><span class="cx">
</span><ins>+ this._previewElement = this._element.appendChild(document.createElement("span"));
+ this._previewElement.className = "preview";
+ this._lossless = this._appendPreview(this._previewElement, this._preview);
+
+ this._titleElement = this._element.appendChild(document.createElement("span"));
+ this._titleElement.className = "title";
+ this._titleElement.textContent = preview.description || "";
+ this._titleElement.hidden = true;
+
</ins><span class="cx"> if (this._lossless)
</span><span class="cx"> this._element.classList.add("lossless");
</span><span class="cx"> };
</span><span class="lines">@@ -71,6 +79,18 @@
</span><span class="cx"> return this._lossless;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ showTitle: function()
+ {
+ this._titleElement.hidden = false;
+ this._previewElement.hidden = true;
+ },
+
+ showPreview: function()
+ {
+ this._titleElement.hidden = true;
+ this._previewElement.hidden = false;
+ },
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _numberOfPropertiesToShowInMode: function()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.css (180484 => 180485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.css 2015-02-22 16:43:32 UTC (rev 180484)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.css 2015-02-22 16:47:54 UTC (rev 180485)
</span><span class="lines">@@ -55,6 +55,10 @@
</span><span class="cx"> background-image: -webkit-canvas(disclosure-triangle-tiny-open-normal);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.object-tree.expanded .object-preview {
+ font-style: normal;
+}
+
</ins><span class="cx"> .object-tree.lossless-preview > :matches(.title, .object-preview)::before {
</span><span class="cx"> background: none;
</span><span class="cx"> width: 0px;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js (180484 => 180485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js 2015-02-22 16:43:32 UTC (rev 180484)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js 2015-02-22 16:47:54 UTC (rev 180485)
</span><span class="lines">@@ -38,26 +38,22 @@
</span><span class="cx"> this._element.className = "object-tree";
</span><span class="cx">
</span><span class="cx"> if (this._object.preview) {
</span><del>- var previewView = new WebInspector.ObjectPreviewView(this._object.preview);
- this._previewElement = previewView.element;
- this._previewElement.addEventListener("click", this._handlePreviewOrTitleElementClick.bind(this));
- this._element.appendChild(this._previewElement);
</del><ins>+ this._previewView = new WebInspector.ObjectPreviewView(this._object.preview);
+ this._previewView.element.addEventListener("click", this._handlePreviewOrTitleElementClick.bind(this));
+ this._element.appendChild(this._previewView.element);
</ins><span class="cx">
</span><del>- if (previewView.lossless && !forceExpanding) {
</del><ins>+ if (this._previewView.lossless && !forceExpanding) {
</ins><span class="cx"> this._hasLosslessPreview = true;
</span><span class="cx"> this.element.classList.add("lossless-preview");
</span><span class="cx"> }
</span><ins>+ } else {
+ this._titleElement = document.createElement("span");
+ this._titleElement.className = "title";
+ this._titleElement.textContent = this._object.description || "";
+ this._titleElement.addEventListener("click", this._handlePreviewOrTitleElementClick.bind(this));
+ this._element.appendChild(this._titleElement);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- this._titleElement = document.createElement("span");
- this._titleElement.className = "title";
- this._titleElement.textContent = this._object.description || "";
- this._titleElement.addEventListener("click", this._handlePreviewOrTitleElementClick.bind(this));
- this._element.appendChild(this._titleElement);
-
- if (this._object.preview)
- this._titleElement.hidden = true;
-
</del><span class="cx"> this._outlineElement = document.createElement("ol");
</span><span class="cx"> this._outlineElement.className = "object-tree-outline";
</span><span class="cx"> this._outline = new TreeOutline(this._outlineElement);
</span><span class="lines">@@ -153,10 +149,8 @@
</span><span class="cx"> this._expanded = true;
</span><span class="cx"> this._element.classList.add("expanded");
</span><span class="cx">
</span><del>- if (this._previewElement) {
- this._previewElement.hidden = true;
- this._titleElement.hidden = false;
- }
</del><ins>+ if (this._previewView)
+ this._previewView.showTitle();
</ins><span class="cx">
</span><span class="cx"> this.update();
</span><span class="cx"> },
</span><span class="lines">@@ -169,10 +163,8 @@
</span><span class="cx"> this._expanded = false;
</span><span class="cx"> this._element.classList.remove("expanded");
</span><span class="cx">
</span><del>- if (this._previewElement) {
- this._previewElement.hidden = false;
- this._titleElement.hidden = true;
- }
</del><ins>+ if (this._previewView)
+ this._previewView.showPreview();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Protected
</span></span></pre>
</div>
</div>
</body>
</html>