OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Fix playground when behind a proxy with a sub-path

Browse Source 
It gets the web URL for the file yet uses the file service to load it,
so having a sub-path causes it not to be found on disk (the sub-path
obviously only means anything for the web server and isn't on disk).
This commit is contained in:
Asher 2019-08-22 12:15:23 -05:00
parent 3e2d12a224
commit 4800ec6392
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/vscode.patch
View File

@ -1117,6 +1117,19 @@ index 63585fc25c..f49b63e024 100644
// apply default script // apply default script
if (options.allowScripts) { if (options.allowScripts) {
const defaultScript = newDocument.createElement('script'); const defaultScript = newDocument.createElement('script');
diff --git a/src/vs/workbench/contrib/welcome/walkThrough/browser/editor/editorWalkThrough.ts b/src/vs/workbench/contrib/welcome/walkThrough/browser/editor/editorWalkThrough.ts
index 7a95ffda9e..fdb14da4ee 100644
--- a/src/vs/workbench/contrib/welcome/walkThrough/browser/editor/editorWalkThrough.ts
+++ b/src/vs/workbench/contrib/welcome/walkThrough/browser/editor/editorWalkThrough.ts
@@ -16,7 +16,7 @@ const typeId = 'workbench.editors.walkThroughInput';
const inputOptions: WalkThroughInputOptions = {
typeId,
name: localize('editorWalkThrough.title', "Interactive Playground"),
- resource: URI.parse(require.toUrl('./vs_code_editor_walkthrough.md'))
+ resource: URI.parse(require.toUrl('./vs_code_editor_walkthrough.md').replace(window.location.href.replace(/\/+$/, ''), window.location.origin))
.with({ scheme: Schemas.walkThrough }),
telemetryFrom: 'walkThrough'
};
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
index 73e8b7c1d1..653d88e4f4 100644 index 73e8b7c1d1..653d88e4f4 100644
--- a/src/vs/workbench/services/environment/browser/environmentService.ts --- a/src/vs/workbench/services/environment/browser/environmentService.ts