gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

tree reload doesn't necessarily re-activates the note

Browse Source
This commit is contained in:
zadam 2019-04-20 21:14:48 +02:00
parent 225e893461
commit f0e22b70f6
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,7 @@ async function expandToNote(notePath, expandOpts) {
}
if (!node) {
console.error(`Can't find node for noteId=${childNoteId} with parentNoteId=${parentNoteId}`);
console.error(`Can't find node for noteId=${childNoteId} with parentNoteId=${parentNoteId} and hoistedNoteId=${hoistedNoteId}`);
}
if (childNoteId === noteId) {
@ -382,6 +382,8 @@ async function treeInitialized() {
}
}
let ignoreNextActivationNoteId = null;
function initFancyTree(tree) {
utils.assertArguments(tree);
@ -410,10 +412,21 @@ function initFancyTree(tree) {
return false;
}
},
beforeActivate: (event, data) => {
// this is for the case when tree reload has been called and we don't want to
if (ignoreNextActivationNoteId && getActiveNode() !== null) {
return false;
}
},
activate: async (event, data) => {
const node = data.node;
const noteId = node.data.noteId;
if (ignoreNextActivationNoteId === noteId) {
ignoreNextActivationNoteId = null;
return;
}
// click event won't propagate so let's close context menu manually
contextMenuWidget.hideContextMenu();
@ -487,7 +500,11 @@ function getTree() {
async function reload() {
const notes = await loadTree();
// this will also reload the note content
// make sure the reload won't trigger reactivation. This is important especially in cases where we wait for the reload
// to finish to then activate some other note. But since the activate() event is called asynchronously, it may be called
// (or finished calling) after we switched to a different note.
ignoreNextActivationNoteId = getActiveNode().data.noteId;
await getTree().reload(notes);
}