zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-02-22 22:13:07 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix sync status in-progress

Browse source
This commit is contained in:
zadam 2021-05-15 13:44:12 +02:00
parent cecce1df20
commit 4ff40ba14f
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/public/app/widgets/sync_status.js
View file

@ -3,7 +3,6 @@ import toastService from "../services/toast.js";
import ws from "../services/ws.js";
import options from "../services/options.js";
import syncService from "../services/sync.js";
import appContext from "../services/app_context.js";
const TPL = `
<div class="sync-status-widget">
@ -108,7 +107,7 @@ export default class SyncStatusWidget extends BasicWidget {
showIcon(className) {
if (!options.get('syncServerHost')) {
this.$widget.hide();
this.toggleInt(false);
return;
}
@ -148,8 +147,8 @@ export default class SyncStatusWidget extends BasicWidget {
this.allChangesPushed = lastSyncedPush === ws.getMaxKnownEntityChangeSyncId();
}
if (this.syncState === 'unknown') {
this.showIcon('unknown');
if (['unknown', 'in-progress'].includes(this.syncState)) {
this.showIcon(this.syncState);
} else {
this.showIcon(this.syncState + '-' + (this.allChangesPushed ? 'no-changes' : 'with-changes'));
}