Source/devtools/front_end/bindings/ResourceUtils.js - Issue 485713002: DevTools: Use targetManager.inspectedPageUrl() instead of resourceTreeModel.inspectedPageUrl()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/devtools/front_end/bindings/ResourceUtils.js

Issue 485713002: DevTools: Use targetManager.inspectedPageUrl() instead of resourceTreeModel.inspectedPageUrl() (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Addrss comments Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « LayoutTests/inspector/sources/debugger/file-system-project-mapping.html ('k') | Source/devtools/front_end/components/DOMBreakpointsSidebarPane.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/devtools/front_end/bindings/ResourceUtils.js

diff --git a/Source/devtools/front_end/bindings/ResourceUtils.js b/Source/devtools/front_end/bindings/ResourceUtils.js

index 273b6bd7785c9c00322d5921c015141fe2b09dee..78cb9139103471a07cec9525c6e665a069ca2234 100644

--- a/Source/devtools/front_end/bindings/ResourceUtils.js

+++ b/Source/devtools/front_end/bindings/ResourceUtils.js

@@ -62,14 +62,14 @@ WebInspector.displayNameForURL = function(url)

if (uiSourceCode)

return uiSourceCode.displayName();

- if (!WebInspector.resourceTreeModel.inspectedPageURL())

+ if (!WebInspector.targetManager.inspectedPageURL())

return url.trimURL("");

- var parsedURL = WebInspector.resourceTreeModel.inspectedPageURL().asParsedURL();

+ var parsedURL = WebInspector.targetManager.inspectedPageURL().asParsedURL();

var lastPathComponent = parsedURL ? parsedURL.lastPathComponent : parsedURL;

- var index = WebInspector.resourceTreeModel.inspectedPageURL().indexOf(lastPathComponent);

- if (index !== -1 && index + lastPathComponent.length === WebInspector.resourceTreeModel.inspectedPageURL().length) {

- var baseURL = WebInspector.resourceTreeModel.inspectedPageURL().substring(0, index);

+ var index = WebInspector.targetManager.inspectedPageURL().indexOf(lastPathComponent);

+ if (index !== -1 && index + lastPathComponent.length === WebInspector.targetManager.inspectedPageURL().length) {

+ var baseURL = WebInspector.targetManager.inspectedPageURL().substring(0, index);

if (url.startsWith(baseURL))

return url.substring(index);

}