Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

add new sync status "unknown" to differentiate from "can't connect", #1844

Browse Source
This commit is contained in:
zadam
2021-04-13 21:54:07 +02:00
parent 44aa2834b3
commit 917b259e92
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/public/app/widgets/sync_status.js
View File

@@ -46,6 +46,11 @@ const TPL = `
</style>
<div class="sync-status">
<span class="sync-status-icon sync-status-unknown"
data-toggle="tooltip"
title="<p>Sync status will be known once the next sync attempt starts.</p><p>Click to trigger sync now.</p>">
<span class="bx bx-time"></span>
</span>
<span class="sync-status-icon sync-status-connected-with-changes"
data-toggle="tooltip"
title="<p>Connected to the sync server. <br>There are some outstanding changes yet to be synced.</p><p>Click to trigger sync.</p>">
@@ -83,8 +88,7 @@ export default class SyncStatusWidget extends BasicWidget {
ws.subscribeToMessages(message => this.processMessage(message));
// extra window doesn't know the status of the sync so it's better to hide it
this.syncState = appContext.isMainWindow ? 'disconnected' : 'unknown';
this.syncState = 'unknown';
this.allChangesPushed = false;
}
@@ -144,9 +148,9 @@ export default class SyncStatusWidget extends BasicWidget {
this.allChangesPushed = lastSyncedPush === ws.getMaxKnownEntityChangeSyncId();
}
if (this.syncState === 'in-progress') {
this.showIcon('in-progress');
} else if (this.syncState !== 'unknown') {
if (this.syncState === 'unknown') {
this.showIcon('unknown');
} else {
this.showIcon(this.syncState + '-' + (this.allChangesPushed ? 'no-changes' : 'with-changes'));
}
}