sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

pull/255/head
zadam 2023-01-10 16:33:35 +07:00
parent edbb60f2b5 4ab90b694f
commit 397dd68666
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/entities/fnote.js
Unescape Escape View File

@ -454,7 +454,7 @@ class FNote {
let childBranches = this.getChildBranches();
if (!childBranches) {
ws.logError(`No children for ${parentNote}. This shouldn't happen.`);
ws.logError(`No children for '${this.noteId}'. This shouldn't happen.`);
return;
}

3
src/public/app/widgets/note_tree.js
Unescape Escape View File

@ -1126,7 +1126,8 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
if (note && note.getChildNoteIds().includes(ecAttr.value)) {
// there's new/deleted imageLink betwen note and its image child - which can show/hide
// the image (if there is a imageLink relation between parent and child then it is assumed to be "contained" in the note and thus does not have to be displayed in the tree)
// the image (if there is a imageLink relation between parent and child
// then it is assumed to be "contained" in the note and thus does not have to be displayed in the tree)
noteIdsToReload.add(ecAttr.noteId);
}
}