Title: [193075] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193075
- Author
- [email protected]
- Date
- 2015-12-03 10:43:33 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r188191. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193074 => 193075)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:43:28 UTC (rev 193074)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:43:33 UTC (rev 193075)
@@ -1,5 +1,20 @@
2015-12-02 Timothy Hatcher <[email protected]>
+ Merge r188191. rdar://problem/23221163
+
+ 2015-08-08 Devin Rousso <[email protected]>
+
+ Web Inspector: Don't show "No Filter Results" when timeline is empty
+ https://bugs.webkit.org/show_bug.cgi?id=147662
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/TimelineView.js:
+ (WebInspector.TimelineView.prototype.reset):
+ Now hides the empty content placeholder on timeline clear.
+
+2015-12-02 Timothy Hatcher <[email protected]>
+
Merge r188188. rdar://problem/23221163
2015-08-07 Devin Rousso <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js (193074 => 193075)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2015-12-03 18:43:28 UTC (rev 193074)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2015-12-03 18:43:33 UTC (rev 193075)
@@ -157,6 +157,7 @@
reset()
{
this._contentTreeOutline.removeChildren();
+ this._timelineSidebarPanel.hideEmptyContentPlaceholder();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
