gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix folder icon for hidden included images

Browse Source
This commit is contained in:
zadam 2020-05-03 13:59:49 +02:00
parent 43e12fbea2
commit 4eb2407c73
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -419,7 +419,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
return labels.map(l => l.value).join(' '); return labels.map(l => l.value).join(' ');
} }
getIcon(note) { getIcon(note, isFolder) {
const hoistedNoteId = hoistedNoteService.getHoistedNoteId(); const hoistedNoteId = hoistedNoteService.getHoistedNoteId();
const iconClass = this.getIconClass(note); const iconClass = this.getIconClass(note);
@ -434,7 +434,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
return "bx bxs-arrow-from-bottom"; return "bx bxs-arrow-from-bottom";
} }
else if (note.type === 'text') { else if (note.type === 'text') {
if (note.hasChildren()) { if (isFolder) {
return "bx bx-folder"; return "bx bx-folder";
} }
else { else {
@ -456,6 +456,8 @@ export default class NoteTreeWidget extends TabAwareWidget {
const title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title; const title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title;
const hoistedNoteId = hoistedNoteService.getHoistedNoteId(); const hoistedNoteId = hoistedNoteService.getHoistedNoteId();
const isFolder = await this.isFolder(note);
const node = { const node = {
noteId: note.noteId, noteId: note.noteId,
parentNoteId: branch.parentNoteId, parentNoteId: branch.parentNoteId,
@ -464,10 +466,10 @@ export default class NoteTreeWidget extends TabAwareWidget {
noteType: note.type, noteType: note.type,
title: utils.escapeHtml(title), title: utils.escapeHtml(title),
extraClasses: this.getExtraClasses(note), extraClasses: this.getExtraClasses(note),
icon: this.getIcon(note), icon: this.getIcon(note, isFolder),
refKey: note.noteId, refKey: note.noteId,
lazy: true, lazy: true,
folder: await this.isFolder(note), folder: isFolder,
expanded: branch.isExpanded || hoistedNoteId === note.noteId, expanded: branch.isExpanded || hoistedNoteId === note.noteId,
key: utils.randomString(12) // this should prevent some "duplicate key" errors key: utils.randomString(12) // this should prevent some "duplicate key" errors
}; };
@ -733,10 +735,12 @@ export default class NoteTreeWidget extends TabAwareWidget {
const note = treeCache.getNoteFromCache(node.data.noteId); const note = treeCache.getNoteFromCache(node.data.noteId);
const branch = treeCache.getBranch(node.data.branchId); const branch = treeCache.getBranch(node.data.branchId);
const isFolder = await this.isFolder(note);
node.data.isProtected = note.isProtected; node.data.isProtected = note.isProtected;
node.data.noteType = note.type; node.data.noteType = note.type;
node.folder = await this.isFolder(note); node.folder = isFolder;
node.icon = this.getIcon(note); node.icon = this.getIcon(note, isFolder);
node.extraClasses = this.getExtraClasses(note); node.extraClasses = this.getExtraClasses(note);
node.title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title; node.title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title;
node.renderTitle(); node.renderTitle();