<!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>[193791] 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/193791">193791</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2015-12-08 16:04:46 -0800 (Tue, 08 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Add a hidden property to TreeOutline
https://bugs.webkit.org/show_bug.cgi?id=152014
Reviewed by Timothy Hatcher.
* UserInterface/Views/NavigationSidebarPanel.js:
Removed static property for "hidden" CSS class. No longer used.
(WebInspector.NavigationSidebarPanel.prototype.set contentTreeOutline):
Fixed bug in order of visibleTreeOutlines add/remove.
(WebInspector.NavigationSidebarPanel.prototype.createContentTreeOutline):
* UserInterface/Views/TimelineSidebarPanel.js:
(WebInspector.TimelineSidebarPanel):
(WebInspector.TimelineSidebarPanel.prototype._changeViewMode):
* UserInterface/Views/TreeOutline.js:
(WebInspector.TreeOutline):
(WebInspector.TreeOutline.prototype.get hidden):
(WebInspector.TreeOutline.prototype.set hidden):
Added hidden property, set DOM element hidden attribute.
(WebInspector.TreeElement.prototype.set hidden):
Remove CSS class, set DOM element hidden attribute.
(WebInspector.TreeElement.prototype._attach):
(WebInspector.TreeElement.prototype.expand):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlinejs">trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (193790 => 193791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-12-08 23:57:13 UTC (rev 193790)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-12-09 00:04:46 UTC (rev 193791)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-12-08 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Add a hidden property to TreeOutline
+ https://bugs.webkit.org/show_bug.cgi?id=152014
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/NavigationSidebarPanel.js:
+ Removed static property for "hidden" CSS class. No longer used.
+ (WebInspector.NavigationSidebarPanel.prototype.set contentTreeOutline):
+ Fixed bug in order of visibleTreeOutlines add/remove.
+ (WebInspector.NavigationSidebarPanel.prototype.createContentTreeOutline):
+
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel):
+ (WebInspector.TimelineSidebarPanel.prototype._changeViewMode):
+
+ * UserInterface/Views/TreeOutline.js:
+ (WebInspector.TreeOutline):
+ (WebInspector.TreeOutline.prototype.get hidden):
+ (WebInspector.TreeOutline.prototype.set hidden):
+ Added hidden property, set DOM element hidden attribute.
+ (WebInspector.TreeElement.prototype.set hidden):
+ Remove CSS class, set DOM element hidden attribute.
+ (WebInspector.TreeElement.prototype._attach):
+ (WebInspector.TreeElement.prototype.expand):
+
+2015-12-08 Matt Baker <mattbaker@apple.com>
+
</ins><span class="cx"> Web Inspector: Global Breakpoints should always be visible
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151066
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (193790 => 193791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2015-12-08 23:57:13 UTC (rev 193790)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2015-12-09 00:04:46 UTC (rev 193791)
</span><span class="lines">@@ -113,13 +113,14 @@
</span><span class="cx"> if (!newTreeOutline)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (this._contentTreeOutline)
- this._contentTreeOutline.element.classList.add(WebInspector.NavigationSidebarPanel.ContentTreeOutlineElementHiddenStyleClassName);
</del><ins>+ if (this._contentTreeOutline) {
+ this._contentTreeOutline.hidden = true;
+ this._visibleContentTreeOutlines.delete(this._contentTreeOutline);
+ }
</ins><span class="cx">
</span><span class="cx"> this._contentTreeOutline = newTreeOutline;
</span><del>- this._contentTreeOutline.element.classList.remove(WebInspector.NavigationSidebarPanel.ContentTreeOutlineElementHiddenStyleClassName);
</del><ins>+ this._contentTreeOutline.hidden = false;
</ins><span class="cx">
</span><del>- this._visibleContentTreeOutlines.delete(this._contentTreeOutline);
</del><span class="cx"> this._visibleContentTreeOutlines.add(newTreeOutline);
</span><span class="cx">
</span><span class="cx"> this._updateFilter();
</span><span class="lines">@@ -156,15 +157,13 @@
</span><span class="cx">
</span><span class="cx"> createContentTreeOutline(dontHideByDefault, suppressFiltering)
</span><span class="cx"> {
</span><del>- var contentTreeOutlineElement = document.createElement("ol");
- contentTreeOutlineElement.className = WebInspector.NavigationSidebarPanel.ContentTreeOutlineElementStyleClassName;
- if (!dontHideByDefault)
- contentTreeOutlineElement.classList.add(WebInspector.NavigationSidebarPanel.ContentTreeOutlineElementHiddenStyleClassName);
- this.contentElement.appendChild(contentTreeOutlineElement);
-
- var contentTreeOutline = new WebInspector.TreeOutline(contentTreeOutlineElement);
</del><ins>+ let contentTreeOutline = new WebInspector.TreeOutline(document.createElement("ol"));
</ins><span class="cx"> contentTreeOutline.allowsRepeatSelection = true;
</span><ins>+ contentTreeOutline.hidden = !dontHideByDefault;
+ contentTreeOutline.element.classList.add(WebInspector.NavigationSidebarPanel.ContentTreeOutlineElementStyleClassName);
</ins><span class="cx">
</span><ins>+ this.contentElement.appendChild(contentTreeOutline.element);
+
</ins><span class="cx"> if (!suppressFiltering) {
</span><span class="cx"> contentTreeOutline.addEventListener(WebInspector.TreeOutline.Event.ElementAdded, this._treeElementAddedOrChanged, this);
</span><span class="cx"> contentTreeOutline.addEventListener(WebInspector.TreeOutline.Event.ElementDidChange, this._treeElementAddedOrChanged, this);
</span><span class="lines">@@ -734,7 +733,6 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.NavigationSidebarPanel.OverflowShadowElementStyleClassName = "overflow-shadow";
</span><span class="cx"> WebInspector.NavigationSidebarPanel.TopOverflowShadowElementStyleClassName = "top";
</span><del>-WebInspector.NavigationSidebarPanel.ContentTreeOutlineElementHiddenStyleClassName = "hidden";
</del><span class="cx"> WebInspector.NavigationSidebarPanel.ContentTreeOutlineElementStyleClassName = "navigation-sidebar-panel-content-tree-outline";
</span><span class="cx"> WebInspector.NavigationSidebarPanel.HideDisclosureButtonsStyleClassName = "hide-disclosure-buttons";
</span><span class="cx"> WebInspector.NavigationSidebarPanel.EmptyContentPlaceholderElementStyleClassName = "empty-content-placeholder";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (193790 => 193791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-12-08 23:57:13 UTC (rev 193790)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-12-09 00:04:46 UTC (rev 193791)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> this._recordingTreeElementMap = new Map;
</span><span class="cx"> this._recordingsTreeOutline = this.createContentTreeOutline(true, true);
</span><span class="cx"> this._recordingsTreeOutline.element.classList.add(WebInspector.NavigationSidebarPanel.HideDisclosureButtonsStyleClassName);
</span><del>- this._recordingsTreeOutline.element.classList.add(WebInspector.NavigationSidebarPanel.ContentTreeOutlineElementHiddenStyleClassName);
</del><ins>+ this._recordingsTreeOutline.hidden = true;
</ins><span class="cx"> this._recordingsTreeOutline.addEventListener(WebInspector.TreeOutline.Event.SelectionDidChange, this._recordingsTreeSelectionDidChange, this);
</span><span class="cx"> this._timelinesContentContainerElement.appendChild(this._recordingsTreeOutline.element);
</span><span class="cx">
</span><span class="lines">@@ -930,10 +930,10 @@
</span><span class="cx"> this._viewModeNavigationBar.selectedNavigationItem = this._viewMode;
</span><span class="cx">
</span><span class="cx"> if (this._viewMode === WebInspector.TimelineSidebarPanel.ViewMode.Timelines) {
</span><del>- this._timelinesTreeOutline.element.classList.remove(WebInspector.NavigationSidebarPanel.ContentTreeOutlineElementHiddenStyleClassName);
</del><ins>+ this._timelinesTreeOutline.hidden = false;
</ins><span class="cx"> this._frameSelectionChartSection.collapsed = true;
</span><span class="cx"> } else {
</span><del>- this._timelinesTreeOutline.element.classList.add(WebInspector.NavigationSidebarPanel.ContentTreeOutlineElementHiddenStyleClassName);
</del><ins>+ this._timelinesTreeOutline.hidden = true;
</ins><span class="cx"> this._frameSelectionChartSection.collapsed = false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlinejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js (193790 => 193791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js 2015-12-08 23:57:13 UTC (rev 193790)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js 2015-12-09 00:04:46 UTC (rev 193791)
</span><span class="lines">@@ -46,13 +46,28 @@
</span><span class="cx"> this.expanded = true;
</span><span class="cx"> this.selected = false;
</span><span class="cx"> this.treeOutline = this;
</span><ins>+ this._hidden = false;
</ins><span class="cx">
</span><span class="cx"> this._childrenListNode.tabIndex = 0;
</span><span class="cx"> this._childrenListNode.addEventListener("keydown", this._treeKeyDown.bind(this), true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Methods
</del><ins>+ // Public
</ins><span class="cx">
</span><ins>+ get hidden()
+ {
+ return this._hidden;
+ }
+
+ set hidden(x)
+ {
+ if (this._hidden === x)
+ return;
+
+ this._hidden = x;
+ this.element.hidden = this._hidden;
+ }
+
</ins><span class="cx"> appendChild(child)
</span><span class="cx"> {
</span><span class="cx"> console.assert(child);
</span><span class="lines">@@ -659,17 +674,10 @@
</span><span class="cx">
</span><span class="cx"> this._hidden = x;
</span><span class="cx">
</span><del>- if (x) {
- if (this._listItemNode)
- this._listItemNode.classList.add("hidden");
- if (this._childrenListNode)
- this._childrenListNode.classList.add("hidden");
- } else {
- if (this._listItemNode)
- this._listItemNode.classList.remove("hidden");
- if (this._childrenListNode)
- this._childrenListNode.classList.remove("hidden");
- }
</del><ins>+ if (this._listItemNode)
+ this._listItemNode.hidden = this._hidden;
+ if (this._childrenListNode)
+ this._childrenListNode.hidden = this._hidden;
</ins><span class="cx">
</span><span class="cx"> if (this.treeOutline)
</span><span class="cx"> this.treeOutline.dispatchEventToListeners(WebInspector.TreeOutline.Event.ElementVisibilityDidChange, {element: this});
</span><span class="lines">@@ -734,9 +742,8 @@
</span><span class="cx"> this._listItemNode.treeElement = this;
</span><span class="cx"> this._setListItemNodeContent();
</span><span class="cx"> this._listItemNode.title = this._tooltip ? this._tooltip : "";
</span><ins>+ this._listItemNode.hidden = this.hidden;
</ins><span class="cx">
</span><del>- if (this.hidden)
- this._listItemNode.classList.add("hidden");
</del><span class="cx"> if (this.hasChildren)
</span><span class="cx"> this._listItemNode.classList.add("parent");
</span><span class="cx"> if (this.expanded)
</span><span class="lines">@@ -880,10 +887,8 @@
</span><span class="cx"> this._childrenListNode = this.treeOutline._childrenListNode.ownerDocument.createElement("ol");
</span><span class="cx"> this._childrenListNode.parentTreeElement = this;
</span><span class="cx"> this._childrenListNode.classList.add("children");
</span><ins>+ this._childrenListNode.hidden = this.hidden;
</ins><span class="cx">
</span><del>- if (this.hidden)
- this._childrenListNode.classList.add("hidden");
-
</del><span class="cx"> this.onpopulate();
</span><span class="cx">
</span><span class="cx"> for (var i = 0; i < this.children.length; ++i)
</span></span></pre>
</div>
</div>
</body>
</html>