zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-22 08:36:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

actual fix for the not disappearing toasts

Browse source
This commit is contained in:
zadam 2019-10-28 20:44:11 +01:00
parent c4d5060a0b
commit 205081c804
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/public/javascripts/services/toast.js
View file

@ -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) {

10
src/services/sync.js
View file

@ -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) {