mirror of
https://github.com/Microsoft/vscode
synced 2024-08-28 05:19:39 +00:00
fix #115290
This commit is contained in:
parent
cbcfaa00f4
commit
7ce63bef17
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "code-oss-dev",
|
||||
"version": "1.53.0",
|
||||
"distro": "14d443d2e9005079e015f35a75d3bb0798c80a36",
|
||||
"distro": "ef4e25f8dccec71b96ee8c6d0a770f1e53bcf84c",
|
||||
"author": {
|
||||
"name": "Microsoft Corporation"
|
||||
},
|
||||
|
@ -225,4 +225,4 @@
|
|||
"elliptic": "^6.5.3",
|
||||
"nwmatcher": "^1.4.4"
|
||||
}
|
||||
}
|
||||
}
|
|
@ -503,20 +503,17 @@ class WindowIndicator implements IWindowIndicator {
|
|||
const settingsSyncOptions: ISettingsSyncOptions | undefined = config.settingsSyncOptions ? {
|
||||
enabled: config.settingsSyncOptions.enabled,
|
||||
enablementHandler: (enablement) => {
|
||||
// Handle enablement only if settings sync is enabled by default
|
||||
if (config.settingsSyncOptions?.enabled) {
|
||||
let queryString = `settingsSync=${enablement ? 'true' : 'false'}`;
|
||||
let queryString = `settingsSync=${enablement ? 'true' : 'false'}`;
|
||||
|
||||
// Save all other query params we might have
|
||||
const query = new URL(document.location.href).searchParams;
|
||||
query.forEach((value, key) => {
|
||||
if (key !== 'settingsSync') {
|
||||
queryString += `&${key}=${value}`;
|
||||
}
|
||||
});
|
||||
// Save all other query params we might have
|
||||
const query = new URL(document.location.href).searchParams;
|
||||
query.forEach((value, key) => {
|
||||
if (key !== 'settingsSync') {
|
||||
queryString += `&${key}=${value}`;
|
||||
}
|
||||
});
|
||||
|
||||
window.location.href = `${window.location.origin}?${queryString}`;
|
||||
}
|
||||
window.location.href = `${window.location.origin}?${queryString}`;
|
||||
}
|
||||
} : undefined;
|
||||
|
||||
|
|
|
@ -24,12 +24,9 @@ export class WebUserDataAutoSyncEnablementService extends UserDataAutoSyncEnable
|
|||
setEnablement(enabled: boolean) {
|
||||
if (this.enabled !== enabled) {
|
||||
this.enabled = enabled;
|
||||
if (this.workbenchEnvironmentService.options?.settingsSyncOptions) {
|
||||
if (this.workbenchEnvironmentService.options.settingsSyncOptions?.enablementHandler) {
|
||||
this.workbenchEnvironmentService.options.settingsSyncOptions.enablementHandler(this.enabled);
|
||||
}
|
||||
} else {
|
||||
super.setEnablement(enabled);
|
||||
super.setEnablement(enabled);
|
||||
if (this.workbenchEnvironmentService.options?.settingsSyncOptions?.enablementHandler) {
|
||||
this.workbenchEnvironmentService.options.settingsSyncOptions.enablementHandler(this.enabled);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue