Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-30 09:56:36 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
# Conflicts:
#	src/public/app/components/note_context.js
This commit is contained in:
zadam
2022-12-10 14:37:02 +01:00
parent 494f8d2153 0f822b2761
commit 1f468f81cc
61 changed files with 1895 additions and 1737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/public/app/components/note_context.js
View File

@@ -63,7 +63,10 @@ class NoteContext extends Component {
});
}
if (this.hoistedNoteId === 'root' && this.notePath.startsWith("root/hidden")) {
if (this.hoistedNoteId === 'root'
&& this.notePath.startsWith("root/hidden")
&& !this.note.hasLabel("keepCurrentHoisting")
) {
// hidden subtree displays only when hoisted so it doesn't make sense to keep root as hoisted note
let hoistedNoteId = 'hidden';