Title: [250407] trunk/Source/WebInspectorUI
- Revision
- 250407
- Author
- joep...@webkit.org
- Date
- 2019-09-26 19:25:42 -0700 (Thu, 26 Sep 2019)
Log Message
Web Inspector: Include LocalResourceOverrides in the Open Resource dialog
https://bugs.webkit.org/show_bug.cgi?id=202023
Reviewed by Devin Rousso.
* UserInterface/Views/OpenResourceDialog.js:
(WI.OpenResourceDialog.prototype._addScriptsForTarget):
Also walk the extraScriptCollection. Some Worker resource loads never
fully become resources.
(WI.OpenResourceDialog.prototype.didPresentDialog):
(WI.OpenResourceDialog.prototype._addLocalResourceOverrides):
Include local resource override resources.
(WI.OpenResourceDialog.prototype._populateResourceTreeOutline):
* Localizations/en.lproj/localizedStrings.js:
Include a subtitle for local resource overrides.
* UserInterface/Views/OpenResourceDialog.css:
(.open-resource-dialog .tree-outline.large .item .titles .subtitle):
Improved subtitle styling.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (250406 => 250407)
--- trunk/Source/WebInspectorUI/ChangeLog 2019-09-27 01:54:08 UTC (rev 250406)
+++ trunk/Source/WebInspectorUI/ChangeLog 2019-09-27 02:25:42 UTC (rev 250407)
@@ -1,3 +1,27 @@
+2019-09-26 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Include LocalResourceOverrides in the Open Resource dialog
+ https://bugs.webkit.org/show_bug.cgi?id=202023
+
+ Reviewed by Devin Rousso.
+
+ * UserInterface/Views/OpenResourceDialog.js:
+ (WI.OpenResourceDialog.prototype._addScriptsForTarget):
+ Also walk the extraScriptCollection. Some Worker resource loads never
+ fully become resources.
+
+ (WI.OpenResourceDialog.prototype.didPresentDialog):
+ (WI.OpenResourceDialog.prototype._addLocalResourceOverrides):
+ Include local resource override resources.
+
+ (WI.OpenResourceDialog.prototype._populateResourceTreeOutline):
+ * Localizations/en.lproj/localizedStrings.js:
+ Include a subtitle for local resource overrides.
+
+ * UserInterface/Views/OpenResourceDialog.css:
+ (.open-resource-dialog .tree-outline.large .item .titles .subtitle):
+ Improved subtitle styling.
+
2019-09-25 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: REGRESSION: Elements detail sidebar sometimes starts collapsed
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (250406 => 250407)
--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2019-09-27 01:54:08 UTC (rev 250406)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2019-09-27 02:25:42 UTC (rev 250407)
@@ -660,6 +660,7 @@
localizedStrings["Load \u2014 %s"] = "Load \u2014 %s";
localizedStrings["Load cancelled"] = "Load cancelled";
localizedStrings["Local File"] = "Local File";
+localizedStrings["Local Override"] = "Local Override";
localizedStrings["Local Override\u2026"] = "Local Override\u2026";
localizedStrings["Local Overrides"] = "Local Overrides";
localizedStrings["Local Storage"] = "Local Storage";
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.css (250406 => 250407)
--- trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.css 2019-09-27 01:54:08 UTC (rev 250406)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.css 2019-09-27 02:25:42 UTC (rev 250407)
@@ -166,7 +166,8 @@
}
.open-resource-dialog .tree-outline.large .item .titles .subtitle {
- vertical-align: 2px;
+ font-size: 11px;
+ vertical-align: 1px;
}
.open-resource-dialog > .tree-outline .item.selected {
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js (250406 => 250407)
--- trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js 2019-09-27 01:54:08 UTC (rev 250406)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js 2019-09-27 02:25:42 UTC (rev 250407)
@@ -111,6 +111,9 @@
treeElement.mainTitle = createHighlightedTitleFragment(resource.displayName, result.matchingTextRanges);
+ if (resource instanceof WI.LocalResource && resource.isLocalResourceOverride)
+ treeElement.subtitle = WI.UIString("Local Override");
+
let path = resource.urlComponents.path;
let lastPathComponent = resource.urlComponents.lastPathComponent;
if (path && lastPathComponent) {
@@ -154,6 +157,8 @@
this._addResourcesForTarget(target);
}
+ this._addLocalResourceOverrides();
+
this._updateFilter();
this._inputElement.focus();
@@ -333,8 +338,25 @@
continue;
this._addResource(script, suppressFilterUpdate);
}
+
+ for (let script of target.extraScriptCollection) {
+ if (script.resource)
+ continue;
+ this._addResource(script, suppressFilterUpdate);
+ }
}
+ _addLocalResourceOverrides()
+ {
+ if (!WI.NetworkManager.supportsLocalResourceOverrides())
+ return;
+
+ const suppressFilterUpdate = true;
+
+ for (let localResourceOverride of WI.networkManager.localResourceOverrides)
+ this._addResource(localResourceOverride.localResource, suppressFilterUpdate);
+ }
+
_mainResourceDidChange(event)
{
if (event.target.isMainFrame())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
