Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 03:29:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch to use vscode-resource scheme in webviews

Browse Source 
Fixes #45784
This commit is contained in:
Matt Bierner
2018-03-14 11:25:29 -07:00
parent a2ac383fba
commit 82084be1bc
19 changed files with 194 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
View File

@@ -22,6 +22,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
import DOM = require('vs/base/browser/dom');
import Event, { Emitter } from 'vs/base/common/event';
import { WebviewInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput';
import URI from 'vs/base/common/uri';
export class WebviewEditor extends BaseWebviewEditor {
@@ -162,7 +163,7 @@ export class WebviewEditor extends BaseWebviewEditor {
allowSvgs: true,
enableWrappedPostMessage: true,
useSameOriginForRoot: false,
localResourceRoots: (input && input.options.localResourceRoots) || this._contextService.getWorkspace().folders.map(x => x.uri)
localResourceRoots: input.options.localResourceRoots || this.getDefaultLocalResourceRoots()
};
input.setHtml(input.html);
@@ -173,6 +174,14 @@ export class WebviewEditor extends BaseWebviewEditor {
this.doUpdateContainer();
}
private getDefaultLocalResourceRoots(): URI[] {
const rootPaths = this._contextService.getWorkspace().folders.map(x => x.uri);
if ((this.input as WebviewInput).extensionFolderPath) {
rootPaths.push((this.input as WebviewInput).extensionFolderPath);
}
return rootPaths;
}
private getWebview(input: WebviewInput): Webview {
if (this._webview) {
return this._webview;