Title: [193052] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193052
- Author
- [email protected]
- Date
- 2015-12-03 10:35:42 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r187872. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193051 => 193052)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:35:37 UTC (rev 193051)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:35:42 UTC (rev 193052)
@@ -1,5 +1,21 @@
2015-12-01 Timothy Hatcher <[email protected]>
+ Merge r187872. rdar://problem/23221163
+
+ 2015-08-04 Brian J. Burg <[email protected]>
+
+ Web Inspector: console error when clicking AppCache folder tree element
+ https://bugs.webkit.org/show_bug.cgi?id=130042
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/StorageSidebarPanel.js:
+ (WebInspector.StorageSidebarPanel._treeElementSelected): Don't try to
+ create a content view for ApplicationCacheManifestTreeElement. We can
+ only create a content view for AppCache frames.
+
+2015-12-01 Timothy Hatcher <[email protected]>
+
Merge r187775. rdar://problem/23221163
2015-08-03 Matt Baker <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/StorageSidebarPanel.js (193051 => 193052)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/StorageSidebarPanel.js 2015-12-03 18:35:37 UTC (rev 193051)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/StorageSidebarPanel.js 2015-12-03 18:35:42 UTC (rev 193052)
@@ -164,7 +164,8 @@
_treeElementSelected(treeElement, selectedByUser)
{
if (treeElement instanceof WebInspector.FolderTreeElement || treeElement instanceof WebInspector.DatabaseHostTreeElement ||
- treeElement instanceof WebInspector.IndexedDatabaseHostTreeElement || treeElement instanceof WebInspector.IndexedDatabaseTreeElement)
+ treeElement instanceof WebInspector.IndexedDatabaseHostTreeElement || treeElement instanceof WebInspector.IndexedDatabaseTreeElement
+ || treeElement instanceof WebInspector.ApplicationCacheManifestTreeElement)
return;
if (treeElement instanceof WebInspector.StorageTreeElement || treeElement instanceof WebInspector.DatabaseTableTreeElement ||
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
