development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not show settings sync off badge if settings sync is enabled

Browse source
This commit is contained in:
Sandeep Somavarapu 2021-07-28 14:41:30 +02:00
parent bedf59228c
commit 92381bc7c9
No known key found for this signature in database
GPG key ID: 1FED25EC4646638B
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/web/code-web.js
View file

@ -447,6 +447,9 @@ async function handleRoot(req, res) {
}, },
selection, selection,
}] }]
} : undefined,
settingsSyncOptions: args['enable-sync'] ? {
enabled: true
} : undefined } : undefined
}; };
if (args['wrap-iframe']) { if (args['wrap-iframe']) {

4
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
View file

@ -177,7 +177,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
private async initializeSyncAfterInitializationContext(): Promise<void> { private async initializeSyncAfterInitializationContext(): Promise<void> {
const requiresInitialization = await this.userDataInitializationService.requiresInitialization(); const requiresInitialization = await this.userDataInitializationService.requiresInitialization();
if (requiresInitialization) { if (requiresInitialization && !this.userDataAutoSyncEnablementService.isEnabled()) {
this.updateSyncAfterInitializationContext(true); this.updateSyncAfterInitializationContext(true);
} else { } else {
this.updateSyncAfterInitializationContext(this.storageService.getBoolean(CONTEXT_SYNC_AFTER_INITIALIZATION.key, StorageScope.GLOBAL, false)); this.updateSyncAfterInitializationContext(this.storageService.getBoolean(CONTEXT_SYNC_AFTER_INITIALIZATION.key, StorageScope.GLOBAL, false));
@ -461,7 +461,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
badge = new ProgressBadge(() => localize('turning on syncing', "Turning on Settings Sync...")); badge = new ProgressBadge(() => localize('turning on syncing', "Turning on Settings Sync..."));
clazz = 'progress-badge'; clazz = 'progress-badge';
priority = 1; priority = 1;
} else if (this.userDataSyncWorkbenchService.accountStatus === AccountStatus.Available && this.syncAfterInitializationContext.get()) { } else if (this.userDataSyncWorkbenchService.accountStatus === AccountStatus.Available && this.syncAfterInitializationContext.get() && !this.userDataAutoSyncEnablementService.isEnabled()) {
badge = new NumberBadge(1, () => localize('settings sync is off', "Settings Sync is Off", SYNC_TITLE)); badge = new NumberBadge(1, () => localize('settings sync is off', "Settings Sync is Off", SYNC_TITLE));
} }