Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-01 19:05:59 +01:00
Code Issues Packages Projects Releases Activity

script can wait until the sync data has been applied

Browse Source
This commit is contained in:
zadam
2019-10-20 17:49:58 +02:00
parent 358fd13c8d
commit 2a5ab3a5e1
6 changed files with 95 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/public/javascripts/services/tree.js
View File

@@ -778,18 +778,21 @@ ws.subscribeToMessages(message => {
}
});
ws.subscribeToOutsideSyncMessages(syncData => {
// this is a synchronous handler - it returns only once the data has been updated
ws.subscribeToOutsideSyncMessages(async syncData => {
const noteIdsToRefresh = new Set();
// this has the problem that the former parentNoteId might not be invalidated
// and the former location of the branch/note won't be removed.
syncData.filter(sync => sync.entityName === 'branches').forEach(sync => noteIdsToRefresh.add(sync.parentNoteId));
syncData.filter(sync => sync.entityName === 'notes').forEach(sync => noteIdsToRefresh.add(sync.noteId));
syncData.filter(sync => sync.entityName === 'notes').forEach(sync => noteIdsToRefresh.add(sync.entityId));
syncData.filter(sync => sync.entityName === 'note_reordering').forEach(sync => noteIdsToRefresh.add(sync.entityId));
reloadNotes(Array.from(noteIdsToRefresh));
if (noteIdsToRefresh.size > 0) {
await reloadNotes(Array.from(noteIdsToRefresh));
}
});
utils.bindGlobalShortcut('ctrl+o', async () => {
@@ -827,6 +830,12 @@ async function checkFolderStatus(node) {
}
async function reloadNotes(noteIds) {
if (noteIds.length === 0) {
return;
}
console.debug("Reloading notes", noteIds);
await treeCache.reloadNotesAndTheirChildren(noteIds);
const activeNotePath = noteDetailService.getActiveTabNotePath();
@@ -843,7 +852,7 @@ async function reloadNotes(noteIds) {
const node = await getNodeFromPath(activeNotePath);
if (node) {
node.setActive(true, {noEvents: true}); // this node has been already active so no need to fire events again
await node.setActive(true, {noEvents: true}); // this node has been already active so no need to fire events again
}
}
}