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

improvements in frontend sync (WIP)

Browse Source
This commit is contained in:
zadam
2021-08-24 22:37:00 +02:00
parent 0ee093f038
commit d27fcaf317
6 changed files with 68 additions and 10924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/public/app/widgets/note_tree.js
View File

@@ -842,12 +842,10 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
}
/** @return {FancytreeNode[]} */
getNodesByBranchId(branchId) {
utils.assertArguments(branchId);
getNodesByBranch(branch) {
utils.assertArguments(branch);
const branch = froca.getBranch(branchId);
return this.getNodesByNoteId(branch.noteId).filter(node => node.data.branchId === branchId);
return this.getNodesByNoteId(branch.noteId).filter(node => node.data.branchId === branch.branchId);
}
/** @return {FancytreeNode[]} */
@@ -1002,7 +1000,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
// adding noteId itself to update all potential clones
noteIdsToUpdate.add(branch.noteId);
for (const node of this.getNodesByBranchId(branch.branchId)) {
for (const node of this.getNodesByBranch(branch)) {
if (branch.isDeleted) {
if (node.isActive()) {
const newActiveNode = node.getNextSibling()