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

Revert "Use custom scheme for loading webview wrapper contents"

Browse Source 
This reverts commit 61f796ee89.

Not sure how this change causes problems but revert seems to fix it.

Fixes #100879
Fixes #100874
This commit is contained in:
Matt Bierner
2020-06-23 14:17:58 -07:00
parent 876ea86423
commit 5c11b81875
6 changed files with 8 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vs/code/electron-main/app.ts
View File

@@ -172,12 +172,11 @@ export class CodeApplication extends Disposable {
return false;
}
const uri = URI.parse(source);
if (uri.scheme === Schemas.vscodeWebview) {
return uri.path === '/index.html';
if (source === 'data:text/html;charset=utf-8,%3C%21DOCTYPE%20html%3E%0D%0A%3Chtml%20lang%3D%22en%22%20style%3D%22width%3A%20100%25%3B%20height%3A%20100%25%22%3E%0D%0A%3Chead%3E%0D%0A%3Ctitle%3EVirtual%20Document%3C%2Ftitle%3E%0D%0A%3C%2Fhead%3E%0D%0A%3Cbody%20style%3D%22margin%3A%200%3B%20overflow%3A%20hidden%3B%20width%3A%20100%25%3B%20height%3A%20100%25%22%20role%3D%22document%22%3E%0D%0A%3C%2Fbody%3E%0D%0A%3C%2Fhtml%3E') {
return true;
}
const srcUri = uri.fsPath.toLowerCase();
const srcUri = URI.parse(source).fsPath.toLowerCase();
const rootUri = URI.file(this.environmentService.appRoot).fsPath.toLowerCase();
return srcUri.startsWith(rootUri + sep);