Skip to content

Commit 4800ec6

Browse files
committed
Fix playground when behind a proxy with a sub-path
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).
1 parent 3e2d12a commit 4800ec6

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

scripts/vscode.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,6 +1117,19 @@ index 63585fc25c..f49b63e024 100644
11171117
// apply default script
11181118
if (options.allowScripts) {
11191119
const defaultScript = newDocument.createElement('script');
1120+
diff --git a/src/vs/workbench/contrib/welcome/walkThrough/browser/editor/editorWalkThrough.ts b/src/vs/workbench/contrib/welcome/walkThrough/browser/editor/editorWalkThrough.ts
1121+
index 7a95ffda9e..fdb14da4ee 100644
1122+
--- a/src/vs/workbench/contrib/welcome/walkThrough/browser/editor/editorWalkThrough.ts
1123+
+++ b/src/vs/workbench/contrib/welcome/walkThrough/browser/editor/editorWalkThrough.ts
1124+
@@ -16,7 +16,7 @@ const typeId = 'workbench.editors.walkThroughInput';
1125+
const inputOptions: WalkThroughInputOptions = {
1126+
typeId,
1127+
name: localize('editorWalkThrough.title', "Interactive Playground"),
1128+
- resource: URI.parse(require.toUrl('./vs_code_editor_walkthrough.md'))
1129+
+ resource: URI.parse(require.toUrl('./vs_code_editor_walkthrough.md').replace(window.location.href.replace(/\/+$/, ''), window.location.origin))
1130+
.with({ scheme: Schemas.walkThrough }),
1131+
telemetryFrom: 'walkThrough'
1132+
};
11201133
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
11211134
index 73e8b7c1d1..653d88e4f4 100644
11221135
--- a/src/vs/workbench/services/environment/browser/environmentService.ts

0 commit comments

Comments
 (0)