Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-14 09:15:50 +01:00
Code Issues Packages Projects Releases Activity

smaller refactorings in note_tree

Browse Source
This commit is contained in:
zadam
2020-08-24 23:33:27 +02:00
parent b7947a40ea
commit 6a3e27eb62
6 changed files with 85 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/public/app/services/hoisted_note.js
View File

@@ -30,16 +30,16 @@ function isRootNode(node) {
async function checkNoteAccess(notePath) {
// notePath argument can contain only noteId which is not good when hoisted since
// then we need to check the whole note path
const runNotePath = await treeService.getRunPath(notePath);
const resolvedNotePath = await treeService.resolveNotePath(notePath);
if (!runNotePath) {
if (!resolvedNotePath) {
console.log("Cannot activate " + notePath);
return false;
}
const hoistedNoteId = getHoistedNoteId();
if (hoistedNoteId !== 'root' && !runNotePath.includes(hoistedNoteId)) {
if (hoistedNoteId !== 'root' && !resolvedNotePath.includes(hoistedNoteId)) {
const confirmDialog = await import('../dialogs/confirm.js');
if (!await confirmDialog.confirm("Requested note is outside of hoisted note subtree and you must unhoist to access the note. Do you want to proceed with unhoisting?")) {
@@ -60,4 +60,4 @@ export default {
isTopLevelNode,
isRootNode,
checkNoteAccess
}
}