<!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>[172334] 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/172334">172334</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-07 23:56:24 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Timeline Filter Bars are not appearing at all
https://bugs.webkit.org/show_bug.cgi?id=135740
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-08-07
Reviewed by Timothy Hatcher.
* UserInterface/Views/TimelineDataGrid.css:
(.data-grid.timeline.has-non-default-filter > .navigation-bar-container):
(.data-grid.timeline > .navigation-bar-container > .navigation-bar):
(body.mac-platform.legacy .data-grid.timeline > .navigation-bar-container > .navigation-bar):
Update the positioning and height for non-legacy because the console is now taller.
* UserInterface/Views/ScopeBar.js:
(WebInspector.ScopeBar.prototype.hasNonDefaultItemSelected):
Helper to know if there is a non-default filter.
* UserInterface/Views/TimelineDataGrid.js:
(WebInspector.TimelineDataGrid.prototype.treeElementMatchesActiveScopeFilters):
(WebInspector.TimelineDataGrid.prototype._scopeBarSelectedItemsDidChange):
Update scope bar visibility. If non-default we want to always show it.
(WebInspector.TimelineDataGrid.prototype._updateScopeBarForcedVisibility):
If there is a non-default filter, force showing the bar.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScopeBarjs">trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBar.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridcss">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (172333 => 172334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-08-08 06:53:22 UTC (rev 172333)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-08-08 06:56:24 UTC (rev 172334)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-08-07 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Timeline Filter Bars are not appearing at all
+ https://bugs.webkit.org/show_bug.cgi?id=135740
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/TimelineDataGrid.css:
+ (.data-grid.timeline.has-non-default-filter > .navigation-bar-container):
+ (.data-grid.timeline > .navigation-bar-container > .navigation-bar):
+ (body.mac-platform.legacy .data-grid.timeline > .navigation-bar-container > .navigation-bar):
+ Update the positioning and height for non-legacy because the console is now taller.
+
+ * UserInterface/Views/ScopeBar.js:
+ (WebInspector.ScopeBar.prototype.hasNonDefaultItemSelected):
+ Helper to know if there is a non-default filter.
+
+ * UserInterface/Views/TimelineDataGrid.js:
+ (WebInspector.TimelineDataGrid.prototype.treeElementMatchesActiveScopeFilters):
+ (WebInspector.TimelineDataGrid.prototype._scopeBarSelectedItemsDidChange):
+ Update scope bar visibility. If non-default we want to always show it.
+
+ (WebInspector.TimelineDataGrid.prototype._updateScopeBarForcedVisibility):
+ If there is a non-default filter, force showing the bar.
+
+2014-08-07 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: breakpoints enabled state is not persisted across re-opening the inspector
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135745
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScopeBarjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBar.js (172333 => 172334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBar.js 2014-08-08 06:53:22 UTC (rev 172333)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBar.js 2014-08-08 06:56:24 UTC (rev 172334)
</span><span class="lines">@@ -62,6 +62,13 @@
</span><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ hasNonDefaultItemSelected: function()
+ {
+ return this._items.some(function(item) {
+ return item.selected && item !== this._defaultItem;
+ }, this);
+ },
+
</ins><span class="cx"> updateLayout: function(expandOnly)
</span><span class="cx"> {
</span><span class="cx"> if (expandOnly)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.css (172333 => 172334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.css 2014-08-08 06:53:22 UTC (rev 172333)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.css 2014-08-08 06:56:24 UTC (rev 172334)
</span><span class="lines">@@ -148,6 +148,10 @@
</span><span class="cx"> visibility: hidden;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.data-grid.timeline.has-non-default-filter > .navigation-bar-container {
+ visibility: visible;
+}
+
</ins><span class="cx"> .data-grid.timeline:hover > .navigation-bar-container {
</span><span class="cx"> pointer-events: all;
</span><span class="cx"> visibility: visible;
</span><span class="lines">@@ -155,10 +159,10 @@
</span><span class="cx">
</span><span class="cx"> .data-grid.timeline > .navigation-bar-container > .navigation-bar {
</span><span class="cx"> position: absolute;
</span><del>- top: 10px;
</del><ins>+ top: 4px;
</ins><span class="cx"> left: 0;
</span><span class="cx"> right: 0;
</span><del>- height: 22px;
</del><ins>+ height: 28px;
</ins><span class="cx">
</span><span class="cx"> border-bottom: none;
</span><span class="cx"> border-top: 1px solid rgb(200, 200, 200);
</span><span class="lines">@@ -167,6 +171,11 @@
</span><span class="cx"> background-color: white;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+body.mac-platform.legacy .data-grid.timeline > .navigation-bar-container > .navigation-bar {
+ top: 10px;
+ height: 22px;
+}
+
</ins><span class="cx"> .timeline-data-grid-tree-outline {
</span><span class="cx"> position: relative;
</span><span class="cx"> padding: 0;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js (172333 => 172334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2014-08-08 06:53:22 UTC (rev 172333)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2014-08-08 06:56:24 UTC (rev 172334)
</span><span class="lines">@@ -35,11 +35,11 @@
</span><span class="cx">
</span><span class="cx"> // Check if any of the cells can be filtered.
</span><span class="cx"> for (var [identifier, column] of this.columns) {
</span><del>- var scopeBar = columns["scopeBar"];
</del><ins>+ var scopeBar = column.scopeBar;
</ins><span class="cx"> if (!scopeBar)
</span><span class="cx"> continue;
</span><span class="cx"> this._filterableColumns.push(identifier);
</span><del>- scopeBar.columnIdenfifier = identifier;
</del><ins>+ scopeBar.columnIdentifier = identifier;
</ins><span class="cx"> scopeBar.addEventListener(WebInspector.ScopeBar.Event.SelectionChanged, this._scopeBarSelectedItemsDidChange, this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -49,11 +49,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (this._filterableColumns.length) {
</span><del>- var items = [new WebInspector.FlexibleSpaceNavigationItem, this.columns.get(this._filterableColumns[0])["scopeBar"], new WebInspector.FlexibleSpaceNavigationItem];
</del><ins>+ var items = [new WebInspector.FlexibleSpaceNavigationItem, this.columns.get(this._filterableColumns[0]).scopeBar, new WebInspector.FlexibleSpaceNavigationItem];
</ins><span class="cx"> this._navigationBar = new WebInspector.NavigationBar(null, items);
</span><span class="cx"> var container = this.element.appendChild(document.createElement("div"));
</span><span class="cx"> container.className = "navigation-bar-container";
</span><span class="cx"> container.appendChild(this._navigationBar.element);
</span><ins>+
+ this._updateScopeBarForcedVisibility();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridSelectedNodeChanged, this);
</span><span class="lines">@@ -63,6 +65,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineDataGrid.StyleClassName = "timeline";
</span><ins>+WebInspector.TimelineDataGrid.HasNonDefaultFilterStyleClassName = "has-non-default-filter";
</ins><span class="cx"> WebInspector.TimelineDataGrid.DelayedPopoverShowTimeout = 250;
</span><span class="cx"> WebInspector.TimelineDataGrid.DelayedPopoverHideContentClearTimeout = 500;
</span><span class="cx">
</span><span class="lines">@@ -149,7 +152,7 @@
</span><span class="cx"> console.assert(dataGridNode);
</span><span class="cx">
</span><span class="cx"> for (var identifier of this._filterableColumns) {
</span><del>- var scopeBar = this.columns.get(identifier)["scopeBar"];
</del><ins>+ var scopeBar = this.columns.get(identifier).scopeBar;
</ins><span class="cx"> if (!scopeBar || scopeBar.defaultItem.selected)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -353,9 +356,22 @@
</span><span class="cx"> return (value1 < value2 ? -1 : (value1 > value2 ? 1 : 0)) * sortDirection;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ _updateScopeBarForcedVisibility: function()
+ {
+ for (var identifier of this._filterableColumns) {
+ var scopeBar = this.columns.get(identifier).scopeBar;
+ if (scopeBar) {
+ this.element.classList.toggle(WebInspector.TimelineDataGrid.HasNonDefaultFilterStyleClassName, scopeBar.hasNonDefaultItemSelected());
+ break;
+ }
+ }
+ },
+
</ins><span class="cx"> _scopeBarSelectedItemsDidChange: function(event)
</span><span class="cx"> {
</span><del>- var columnIdentifier = event.target.columnIdenfifier;
</del><ins>+ this._updateScopeBarForcedVisibility();
+
+ var columnIdentifier = event.target.columnIdentifier;
</ins><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineDataGrid.Event.FiltersDidChange, {columnIdentifier: columnIdentifier});
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>