Title: [172570] branches/safari-600.1-branch/Source/WebInspectorUI
- Revision
- 172570
- Author
- [email protected]
- Date
- 2014-08-13 21:15:10 -0700 (Wed, 13 Aug 2014)
Log Message
Merged r172531. <rdar://problem/18008775>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (172569 => 172570)
--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-14 04:13:30 UTC (rev 172569)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-14 04:15:10 UTC (rev 172570)
@@ -1,5 +1,21 @@
2014-08-13 Lucas Forschler <[email protected]>
+ Merge r172531
+
+ 2014-08-13 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: "No Filter Results" view only shows once, does not show again
+ https://bugs.webkit.org/show_bug.cgi?id=135892
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/NavigationSidebarPanel.js:
+ (WebInspector.NavigationSidebarPanel.prototype.showEmptyContentPlaceholder):
+ We were checking at the wrong level for a parent. Check if the root
+ placeholder element has a parent or not.
+
+2014-08-13 Lucas Forschler <[email protected]>
+
Merge r172530
2014-08-13 Joseph Pecoraro <[email protected]>
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (172569 => 172570)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2014-08-14 04:13:30 UTC (rev 172569)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2014-08-14 04:15:10 UTC (rev 172570)
@@ -261,7 +261,7 @@
{
console.assert(message);
- if (this._emptyContentPlaceholderMessageElement.parentNode && this._emptyContentPlaceholderMessageElement.textContent === message)
+ if (this._emptyContentPlaceholderElement.parentNode && this._emptyContentPlaceholderMessageElement.textContent === message)
return;
this._emptyContentPlaceholderMessageElement.textContent = message;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
