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

don't allow deleting hoisted note + other related fixes, closes #488

Browse Source
This commit is contained in:
zadam
2019-04-16 21:40:04 +02:00
parent 3760835608
commit 064a11d872
12 changed files with 66 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/public/javascripts/services/tree_utils.js
View File

@@ -1,10 +1,11 @@
import utils from './utils.js';
import hoistedNoteService from './hoisted_note.js';
import treeCache from "./tree_cache.js";
const $tree = $("#tree");
function getParentProtectedStatus(node) {
return utils.isRootNode(node) ? 0 : node.getParent().data.isProtected;
async function getParentProtectedStatus(node) {
return await hoistedNoteService.isRootNode(node) ? 0 : node.getParent().data.isProtected;
}
function getNodeByKey(key) {
@@ -21,10 +22,15 @@ function getNoteIdFromNotePath(notePath) {
return path[path.length - 1];
}
function getNotePath(node) {
async function getNotePath(node) {
if (!node) {
console.error("Node is null");
return "";
}
const path = [];
while (node && !utils.isRootNode(node)) {
while (node && !await hoistedNoteService.isRootNode(node)) {
if (node.data.noteId) {
path.push(node.data.noteId);
}
@@ -32,7 +38,7 @@ function getNotePath(node) {
node = node.getParent();
}
path.push('root');
path.push(node.data.noteId); // root or hoisted noteId
return path.reverse().join("/");
}