Title: [236918] trunk/Source/WebInspectorUI
- Revision
- 236918
- Author
- [email protected]
- Date
- 2018-10-08 10:15:19 -0700 (Mon, 08 Oct 2018)
Log Message
Web Inspector: Open Resource Dialog should show path to resource (to disambiguate resources with same name)
https://bugs.webkit.org/show_bug.cgi?id=178153
<rdar://problem/34925686>
Reviewed by Brian Burg.
* UserInterface/Views/OpenResourceDialog.js:
(WI.OpenResourceDialog.prototype._populateResourceTreeOutline):
* UserInterface/Views/OpenResourceDialog.css:
(.open-resource-dialog .tree-outline.large .item .titles[data-path]): Added.
(.open-resource-dialog .tree-outline.large .item .titles[data-path]::after): Added.
(.open-resource-dialog .tree-outline.large .item .titles .title): Added.
(.open-resource-dialog .tree-outline.large .item .titles .subtitle): Added.
(.open-resource-dialog .tree-outline.large .item .titles): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (236917 => 236918)
--- trunk/Source/WebInspectorUI/ChangeLog 2018-10-08 17:12:38 UTC (rev 236917)
+++ trunk/Source/WebInspectorUI/ChangeLog 2018-10-08 17:15:19 UTC (rev 236918)
@@ -1,3 +1,20 @@
+2018-10-08 Devin Rousso <[email protected]>
+
+ Web Inspector: Open Resource Dialog should show path to resource (to disambiguate resources with same name)
+ https://bugs.webkit.org/show_bug.cgi?id=178153
+ <rdar://problem/34925686>
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Views/OpenResourceDialog.js:
+ (WI.OpenResourceDialog.prototype._populateResourceTreeOutline):
+ * UserInterface/Views/OpenResourceDialog.css:
+ (.open-resource-dialog .tree-outline.large .item .titles[data-path]): Added.
+ (.open-resource-dialog .tree-outline.large .item .titles[data-path]::after): Added.
+ (.open-resource-dialog .tree-outline.large .item .titles .title): Added.
+ (.open-resource-dialog .tree-outline.large .item .titles .subtitle): Added.
+ (.open-resource-dialog .tree-outline.large .item .titles): Deleted.
+
2018-10-05 Devin Rousso <[email protected]>
Web Inspector: add WebVTT MIME/file type mappings to the frontend
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.css (236917 => 236918)
--- trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.css 2018-10-08 17:12:38 UTC (rev 236917)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.css 2018-10-08 17:15:19 UTC (rev 236918)
@@ -174,10 +174,24 @@
margin-top: 6px;
}
-.open-resource-dialog .tree-outline.large .item .titles {
- top: 14px;
+.open-resource-dialog .tree-outline.large .item .titles[data-path] {
+ top: 6px;
}
+.open-resource-dialog .tree-outline.large .item .titles[data-path]::after {
+ display: block;
+ font-size: 10px;
+ content: attr(data-path);
+}
+
+.open-resource-dialog .tree-outline.large .item .titles .title {
+ font-size: 15px;
+}
+
+.open-resource-dialog .tree-outline.large .item .titles .subtitle {
+ vertical-align: 2px;
+}
+
body[dir=ltr] .open-resource-dialog > .tree-outline .item {
padding-left: var(--open-resource-dialog-tree-outline-item-padding-start);
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js (236917 => 236918)
--- trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js 2018-10-08 17:12:38 UTC (rev 236917)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js 2018-10-08 17:15:19 UTC (rev 236918)
@@ -110,6 +110,15 @@
continue;
treeElement.mainTitle = createHighlightedTitleFragment(resource.displayName, result.matchingTextRanges);
+
+ let path = resource.urlComponents.path;
+ let lastPathComponent = resource.urlComponents.lastPathComponent;
+ if (path && lastPathComponent) {
+ let parentPath = path.substring(0, path.length - lastPathComponent.length);
+ if (parentPath.length && parentPath !== "/")
+ treeElement.titlesElement.dataset.path = parentPath;
+ }
+
treeElement[WI.OpenResourceDialog.ResourceMatchCookieDataSymbol] = result.cookie;
this._treeOutline.appendChild(treeElement);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
