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

fix creating new note

Browse Source
This commit is contained in:
zadam 2020-08-28 14:29:20 +02:00
parent 30e84321f9
commit 9873dd1242
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/public/app/entities/note_short.js
View File

@ -56,6 +56,10 @@ class NoteShort {
}
addParent(parentNoteId, branchId) {
if (parentNoteId === 'none') {
return;
}
if (!this.parents.includes(parentNoteId)) {
this.parents.push(parentNoteId);
}
@ -451,7 +455,7 @@ class NoteShort {
}
for (const parentNote of this.getParentNotes()) {
if (parentNote.hasAncestor(ancestorNote)) {console.log(parentNote);
if (parentNote.hasAncestor(ancestorNote)) {
return true;
}
}

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

@ -620,11 +620,11 @@ export default class NoteTreeWidget extends TabAwareWidget {
/**
* @param {Branch} branch
*/
prepareNode(branch) {
prepareNode(branch, forceLazy = false) {
const note = branch.getNoteFromCache();
if (!note) {
throw new Error(`Branch has no note "${branch.noteId}": ${JSON.stringify(branch)}`);
throw new Error(`Branch "${branch.branchId}" has no note "${branch.noteId}"`);
}
const title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title;
@ -648,7 +648,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
key: utils.randomString(12) // this should prevent some "duplicate key" errors
};
if (isFolder && node.expanded) {
if (isFolder && node.expanded && !forceLazy) {
node.children = this.prepareChildren(note);
}
@ -984,7 +984,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
}, 600 * 1000);
}
async entitiesReloadedEvent({loadResults}) {
async entitiesReloadedEvent({loadResults}) {console.log(loadResults);
this.activityDetected();
if (loadResults.isEmptyForTree()) {
@ -1058,7 +1058,11 @@ export default class NoteTreeWidget extends TabAwareWidget {
const found = (parentNode.getChildren() || []).find(child => child.data.noteId === branch.noteId);
if (!found) {
parentNode.addChildren([await this.prepareNode(branch)]);
// make sure it's loaded
await treeCache.getNote(branch.noteId);
// we're forcing lazy since it's not clear if the whole required subtree is in tree cache
parentNode.addChildren([this.prepareNode(branch, true)]);
this.sortChildren(parentNode);
}