zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-22 08:36:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse source
This commit is contained in:
zadam 2019-10-26 20:48:56 +02:00
parent 7ccbf45569
commit bdf42749f3
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/public/javascripts/entities/note_short.js
View file

@ -80,7 +80,7 @@ class NoteShort {
const branchIdPos = {}; const branchIdPos = {};
for (const branchId of Object.values(this.childToBranch)) { for (const branchId of Object.values(this.childToBranch)) {
branchIdPos[branchId] = this.treeCache.branches[branchId].notePosition; branchIdPos[branchId] = this.treeCache.getBranch(branchId).notePosition;
} }
this.children.sort((a, b) => branchIdPos[this.childToBranch[a]] < branchIdPos[this.childToBranch[b]] ? -1 : 1); this.children.sort((a, b) => branchIdPos[this.childToBranch[a]] < branchIdPos[this.childToBranch[b]] ? -1 : 1);

1
src/public/javascripts/services/tree.js
View file

@ -824,6 +824,7 @@ async function checkFolderStatus(node) {
node.folder = note.type === 'search' || note.getChildNoteIds().length > 0; node.folder = note.type === 'search' || note.getChildNoteIds().length > 0;
node.icon = await treeBuilder.getIcon(note); node.icon = await treeBuilder.getIcon(note);
node.extraClasses = await treeBuilder.getExtraClasses(note);
node.renderTitle(); node.renderTitle();
} }

12
src/public/javascripts/services/tree_cache.js
View file

@ -31,8 +31,6 @@ class TreeCache {
for (const branchRow of branchRows) { for (const branchRow of branchRows) {
const branch = new Branch(this, branchRow); const branch = new Branch(this, branchRow);
this.addBranch(branch);
branchesByNotes[branch.noteId] = branchesByNotes[branch.noteId] || []; branchesByNotes[branch.noteId] = branchesByNotes[branch.noteId] || [];
branchesByNotes[branch.noteId].push(branch); branchesByNotes[branch.noteId].push(branch);
@ -79,6 +77,10 @@ class TreeCache {
} }
} }
for (const branch of branchesByNotes[noteId]) {
this.addBranch(branch);
}
const note = new NoteShort(this, noteRow, branchesByNotes[noteId]); const note = new NoteShort(this, noteRow, branchesByNotes[noteId]);
this.notes[note.noteId] = note; this.notes[note.noteId] = note;
@ -102,7 +104,6 @@ class TreeCache {
} }
async reloadNotes(noteIds) { async reloadNotes(noteIds) {
// first load the data before clearing the cache
const resp = await server.post('tree/load', { noteIds }); const resp = await server.post('tree/load', { noteIds });
this.addResp(resp.notes, resp.branches); this.addResp(resp.notes, resp.branches);
@ -161,8 +162,9 @@ class TreeCache {
if (!(branchId in this.branches)) { if (!(branchId in this.branches)) {
console.error(`Not existing branch ${branchId}`); console.error(`Not existing branch ${branchId}`);
} }
else {
return this.branches[branchId]; return this.branches[branchId];
}
} }
} }