zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-01-16 20:21:43 +08:00
Code Issues Projects Releases Packages Wiki Activity

update correctly "multi-parent" node status, fixes #1688

Browse source
This commit is contained in:
zadam 2021-02-25 21:16:21 +01:00
parent 7572ee284b
commit cb6d35236c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/public/app/widgets/component.js
View file

@ -92,7 +92,7 @@ export default class Component {
}
if (glob.isDev) {
await utils.timeLimit(promise, 3000, `Time limit failed on ${this.constructor.name} with ${fun.name}`);
await utils.timeLimit(promise, 20000, `Time limit failed on ${this.constructor.name} with ${fun.name}`);
}
else {
// cheaper and in non-dev the extra reporting is lost anyway through reload

6
src/public/app/widgets/note_tree.js
View file

@ -1030,6 +1030,9 @@ export default class NoteTreeWidget extends TabAwareWidget {
}
for (const branch of loadResults.getBranches()) {
// adding noteId itself to update all potential clones
noteIdsToUpdate.add(branch.noteId);
for (const node of this.getNodesByBranchId(branch.branchId)) {
if (branch.isDeleted) {
if (node.isActive()) {
@ -1048,9 +1051,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
noteIdsToUpdate.add(branch.parentNoteId);
}
else {
noteIdsToUpdate.add(branch.noteId);
}
}
if (!branch.isDeleted) {