mirror of
https://github.com/zadam/trilium.git
synced 2024-09-21 08:06:03 +08:00
fix calendar widget when hoisted into hidden subtree
This commit is contained in:
parent
c34bccf7e8
commit
c6a05d8853
|
@ -39,6 +39,8 @@ class NoteContext extends Component {
|
|||
async setNote(inputNotePath, triggerSwitchEvent = true) {
|
||||
const resolvedNotePath = await this.getResolvedNotePath(inputNotePath);
|
||||
|
||||
console.log("EEEEEE", inputNotePath, resolvedNotePath);
|
||||
|
||||
if (!resolvedNotePath) {
|
||||
return;
|
||||
}
|
||||
|
@ -67,14 +69,14 @@ class NoteContext extends Component {
|
|||
&& 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
|
||||
// hidden subtree displays only when hoisted, so it doesn't make sense to keep root as hoisted note
|
||||
|
||||
let hoistedNoteId = '_hidden';
|
||||
|
||||
if (this.note.isLaunchBarConfig()) {
|
||||
hoistedNoteId = '_lbRoot';
|
||||
} else if (this.note.isOptions()) {
|
||||
hoistedNoteId = 'options';
|
||||
hoistedNoteId = '_options';
|
||||
}
|
||||
|
||||
await this.setHoistedNoteId(hoistedNoteId);
|
||||
|
|
|
@ -54,8 +54,8 @@ async function checkNoteAccess(notePath, noteContext) {
|
|||
const requestedNote = await froca.getNote(treeService.getNoteIdFromNotePath(resolvedNotePath));
|
||||
const hoistedNote = await froca.getNote(hoistedNoteId);
|
||||
|
||||
if (hoistedNote.hasAncestor('_hidden')
|
||||
|| !await dialogService.confirm(`Requested note '${requestedNote.title}' is outside of hoisted note '${hoistedNote.title}' subtree and you must unhoist to access the note. Do you want to proceed with unhoisting?`)) {
|
||||
if (!hoistedNote.hasAncestor('_hidden')
|
||||
&& !await dialogService.confirm(`Requested note '${requestedNote.title}' is outside of hoisted note '${hoistedNote.title}' subtree and you must unhoist to access the note. Do you want to proceed with unhoisting?`)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue