third_party/WebKit/Source/devtools/front_end/sources/WorkspaceMappingTip.js - Issue 1564113003: DevTools: merge uisourcecode's url-alike members.

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: third_party/WebKit/Source/devtools/front_end/sources/WorkspaceMappingTip.js

Issue 1564113003: DevTools: merge uisourcecode's url-alike members. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review comments addressed Created 4 years, 11 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 | « third_party/WebKit/Source/devtools/front_end/sources/TabbedEditorContainer.js ('k') | third_party/WebKit/Source/devtools/front_end/workspace/FileSystemMapping.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/sources/WorkspaceMappingTip.js

diff --git a/third_party/WebKit/Source/devtools/front_end/sources/WorkspaceMappingTip.js b/third_party/WebKit/Source/devtools/front_end/sources/WorkspaceMappingTip.js

index 7e10c1c14cd514fca8a888db5dcdbce05fd7538e..4df8e37f10fb5133799ce382ddb5a3a2ce6db38f 100644

--- a/third_party/WebKit/Source/devtools/front_end/sources/WorkspaceMappingTip.js

+++ b/third_party/WebKit/Source/devtools/front_end/sources/WorkspaceMappingTip.js

@@ -61,7 +61,7 @@ WebInspector.WorkspaceMappingTip.prototype = {

var name = uiSourceCode.name();

var networkUiSourceCodes = networkProjects[i].uiSourceCodes();

for (var j = 0; j < networkUiSourceCodes.length; ++j) {

- if (networkUiSourceCodes[j].name() === name && this._isLocalHost(networkUiSourceCodes[j].originURL())) {

+ if (networkUiSourceCodes[j].name() === name && this._isLocalHost(networkUiSourceCodes[j].url())) {

this._showMappingInfobar(uiSourceCode, false);

return;

}

@@ -72,7 +72,7 @@ WebInspector.WorkspaceMappingTip.prototype = {

// Then map network -> filesystem.

if (uiSourceCode.project().type() === WebInspector.projectTypes.Network || uiSourceCode.project().type() === WebInspector.projectTypes.ContentScripts) {

// Suggest for localhost only.

- if (!this._isLocalHost(uiSourceCode.originURL()))

+ if (!this._isLocalHost(uiSourceCode.url()))

return;

var networkURL = WebInspector.networkMapping.networkURL(uiSourceCode);

if (WebInspector.networkMapping.uiSourceCodeForURLForAnyTarget(networkURL) !== uiSourceCode)

@@ -125,9 +125,9 @@ WebInspector.WorkspaceMappingTip.prototype = {

{

var title;

if (isNetwork)

- title = WebInspector.UIString("Map network resource '%s' to workspace?", uiSourceCode.originURL());

+ title = WebInspector.UIString("Map network resource '%s' to workspace?", uiSourceCode.url());

else

- title = WebInspector.UIString("Map workspace resource '%s' to network?", uiSourceCode.path());

+ title = WebInspector.UIString("Map workspace resource '%s' to network?", uiSourceCode.url());

var infobar = new WebInspector.UISourceCodeFrame.Infobar(WebInspector.Infobar.Type.Info, title, this._workspaceMappingInfobarDisabledSetting);

infobar.createDetailsRowMessage(WebInspector.UIString("You can map files in your workspace to the ones loaded over the network. As a result, changes made in DevTools will be persisted to disk."));