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 Packages Projects Releases Wiki Activity

experimental hiding of images if they are included in the parent note

Browse Source
This commit is contained in:
zadam 2020-04-27 23:27:45 +02:00
parent ffbfccb701
commit 5769587305
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/public/app/services/tree_builder.js
View File

@ -98,9 +98,8 @@ async function prepareNode(branch) {
key: utils.randomString(12) // this should prevent some "duplicate key" errors key: utils.randomString(12) // this should prevent some "duplicate key" errors
}; };
if (note.hasChildren() || note.type === 'search') { node.folder = getChildBranchesWithoutImages(note).length > 0
node.folder = true; || note.type === 'search';
}
return node; return node;
} }
@ -108,16 +107,9 @@ async function prepareNode(branch) {
async function prepareRealBranch(parentNote) { async function prepareRealBranch(parentNote) {
utils.assertArguments(parentNote); utils.assertArguments(parentNote);
const childBranches = await parentNote.getChildBranches();
if (!childBranches) {
ws.logError(`No children for ${parentNote}. This shouldn't happen.`);
return;
}
const noteList = []; const noteList = [];
for (const branch of childBranches) { for (const branch of getChildBranchesWithoutImages(parentNote)) {
const node = await prepareNode(branch); const node = await prepareNode(branch);
noteList.push(node); noteList.push(node);
@ -126,6 +118,20 @@ async function prepareRealBranch(parentNote) {
return noteList; return noteList;
} }
function getChildBranchesWithoutImages(parentNote) {
const childBranches = parentNote.getChildBranches();
if (!childBranches) {
ws.logError(`No children for ${parentNote}. This shouldn't happen.`);
return;
}
const imageLinks = parentNote.getRelations('imageLink');
// image is already visible in the parent note so no need to display it separately in the book
return childBranches.filter(branch => !imageLinks.find(rel => rel.value === branch.noteId));
}
async function prepareSearchBranch(note) { async function prepareSearchBranch(note) {
await treeCache.reloadNotes([note.noteId]); await treeCache.reloadNotes([note.noteId]);
@ -170,5 +176,6 @@ export default {
prepareRootNode, prepareRootNode,
prepareBranch, prepareBranch,
getExtraClasses, getExtraClasses,
getIcon getIcon,
getChildBranchesWithoutImages
} }

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

@ -389,7 +389,8 @@ export default class NoteTreeWidget extends TabAwareWidget {
node.data.isProtected = note.isProtected; node.data.isProtected = note.isProtected;
node.data.noteType = note.type; node.data.noteType = note.type;
node.folder = note.type === 'search' || note.getChildNoteIds().length > 0; node.folder = treeBuilder.getChildBranchesWithoutImages(note).length > 0
|| note.type === 'search';
node.icon = treeBuilder.getIcon(note); node.icon = treeBuilder.getIcon(note);
node.extraClasses = treeBuilder.getExtraClasses(note); node.extraClasses = treeBuilder.getExtraClasses(note);
node.title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title; node.title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title;
@ -481,6 +482,15 @@ export default class NoteTreeWidget extends TabAwareWidget {
// missing handling of things inherited from template // missing handling of things inherited from template
noteIdsToReload.add(attr.noteId); noteIdsToReload.add(attr.noteId);
} }
else if (attr.type === 'relation' && attr.name === 'imageLink') {
const note = treeCache.getNoteFromCache(attr.noteId);
if (note && note.getChildNoteIds().includes(attr.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)
noteIdsToReload.add(attr.noteId);
}
}
} }
for (const branch of loadResults.getBranches()) { for (const branch of loadResults.getBranches()) {