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

fix deleting

Browse Source
This commit is contained in:
zadam
2020-02-12 22:25:52 +01:00
parent 789f62267c
commit 380bb0cd01
6 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/public/javascripts/widgets/note_tree.js
View File

@@ -432,6 +432,8 @@ export default class NoteTreeWidget extends TabAwareWidget {
}
newActiveNode.setActive(true, {noEvents: true});
newActiveNode.makeVisible({scrollIntoView: true});
}
}
}
@@ -458,27 +460,19 @@ export default class NoteTreeWidget extends TabAwareWidget {
for (const branch of loadResults.getBranches()) {
for (const node of this.getNodesByBranchId(branch.branchId)) {
if (branch.isDeleted) {
node.data.toBeRemoved = true;
if (node.isActive()) {
let curNode = node;
const newActiveNode = node.getNextSibling()
|| node.getPrevSibling()
|| node.getParent();
while (curNode.data.toBeRemoved) {
if (curNode.getNextSibling() && !curNode.getNextSibling().data.toBeRemoved) {
curNode = curNode.getNextSibling();
}
else if (curNode.getPrevSibling() && !curNode.getPrevSibling().data.toBeRemoved) {
curNode = curNode.getPrevSibling();
}
else {
curNode = curNode.getParent();
}
if (newActiveNode) {
newActiveNode.setActive(true, {noEvents: true, noFocus: true});
}
curNode.setActive(true, {noEvents:true, noFocus:true});
}
noteIdsToReload.add(branch.parentNoteId);
node.remove();
noteIdsToUpdate.add(branch.parentNoteId);
}
else {
noteIdsToUpdate.add(branch.noteId);