mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00
actual fix for the not disappearing toasts
This commit is contained in:
parent
c4d5060a0b
commit
205081c804
@ -33,7 +33,7 @@ function toast(options) {
|
||||
}
|
||||
|
||||
function showPersistent(options) {
|
||||
let $toast = $("#toast-persistent-" + options.id);
|
||||
let $toast = $("#toast-" + options.id);
|
||||
|
||||
if ($toast.length > 0) {
|
||||
$toast.find('.toast-body').html(options.message);
|
||||
@ -50,7 +50,7 @@ function showPersistent(options) {
|
||||
}
|
||||
|
||||
function closePersistent(id) {
|
||||
$("#toast-persistent-" + id).toast("dispose");
|
||||
$("#toast-" + id).toast("dispose");
|
||||
}
|
||||
|
||||
function showMessage(message, delay = 2000) {
|
||||
|
@ -141,10 +141,14 @@ async function pullSync(syncContext) {
|
||||
log.info("Pulled " + rows.length + " changes from " + changesUri + " in "
|
||||
+ (Date.now() - startDate.getTime()) + "ms");
|
||||
|
||||
ws.syncPullInProgress();
|
||||
|
||||
for (const {sync, entity} of rows) {
|
||||
if (!sourceIdService.isLocalSourceId(sync.sourceId)) {
|
||||
if (appliedPulls === 0 && sync.entity !== 'recent_notes') { // send only for first
|
||||
ws.syncPullInProgress();
|
||||
|
||||
appliedPulls++;
|
||||
}
|
||||
|
||||
await syncUpdateService.updateEntity(sync, entity, syncContext.sourceId);
|
||||
}
|
||||
|
||||
@ -152,8 +156,6 @@ async function pullSync(syncContext) {
|
||||
}
|
||||
|
||||
await setLastSyncedPull(rows[rows.length - 1].sync.id);
|
||||
|
||||
appliedPulls += rows.length;
|
||||
}
|
||||
|
||||
if (appliedPulls > 0) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user