Remove extra slash when opening folder

This commit is contained in:
Asher 2019-08-12 11:36:47 -05:00
parent b566b66590
commit 5539519691
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A

View File

@ -556,7 +556,7 @@ index ede771a03e..bb40fcdd6b 100644
if (!userDataProvider) { if (!userDataProvider) {
const remoteUserDataUri = this.getRemoteUserDataUri(); const remoteUserDataUri = this.getRemoteUserDataUri();
diff --git a/src/vs/workbench/browser/web.simpleservices.ts b/src/vs/workbench/browser/web.simpleservices.ts diff --git a/src/vs/workbench/browser/web.simpleservices.ts b/src/vs/workbench/browser/web.simpleservices.ts
index 25414d8733..73aca01cd2 100644 index 25414d8733..a0de828393 100644
--- a/src/vs/workbench/browser/web.simpleservices.ts --- a/src/vs/workbench/browser/web.simpleservices.ts
+++ b/src/vs/workbench/browser/web.simpleservices.ts +++ b/src/vs/workbench/browser/web.simpleservices.ts
@@ -38,6 +38,9 @@ import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteA @@ -38,6 +38,9 @@ import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteA
@ -600,7 +600,7 @@ index 25414d8733..73aca01cd2 100644
const uri = _uris[i]; const uri = _uris[i];
if ('folderUri' in uri) { if ('folderUri' in uri) {
- const newAddress = `${document.location.origin}/?folder=${uri.folderUri.path}${this.workbenchEnvironmentService.configuration.connectionToken ? `&tkn=${this.workbenchEnvironmentService.configuration.connectionToken}` : ''}`; - const newAddress = `${document.location.origin}/?folder=${uri.folderUri.path}${this.workbenchEnvironmentService.configuration.connectionToken ? `&tkn=${this.workbenchEnvironmentService.configuration.connectionToken}` : ''}`;
+ const newAddress = `${window.location}/?folder=${uri.folderUri.path}${this.workbenchEnvironmentService.configuration.connectionToken ? `&tkn=${this.workbenchEnvironmentService.configuration.connectionToken}` : ''}`; + const newAddress = `${window.location}?folder=${uri.folderUri.path}${this.workbenchEnvironmentService.configuration.connectionToken ? `&tkn=${this.workbenchEnvironmentService.configuration.connectionToken}` : ''}`;
if (openFolderInNewWindow) { if (openFolderInNewWindow) {
window.open(newAddress); window.open(newAddress);
} else { } else {
@ -609,7 +609,7 @@ index 25414d8733..73aca01cd2 100644
} }
if ('workspaceUri' in uri) { if ('workspaceUri' in uri) {
- const newAddress = `${document.location.origin}/?workspace=${uri.workspaceUri.path}`; - const newAddress = `${document.location.origin}/?workspace=${uri.workspaceUri.path}`;
+ const newAddress = `${window.location}/?workspace=${uri.workspaceUri.path}`; + const newAddress = `${window.location}?workspace=${uri.workspaceUri.path}`;
if (openFolderInNewWindow) { if (openFolderInNewWindow) {
window.open(newAddress); window.open(newAddress);
} else { } else {