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

fixes in working with top level nodes and root node

Browse Source
This commit is contained in:
azivner
2017-12-23 12:19:15 -05:00
parent 14f44b3271
commit 8bc12a2654
4 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
public/javascripts/tree_changes.js
View File

@@ -58,7 +58,7 @@ const treeChanges = (function() {
await server.remove('notes/' + node.data.note_tree_id);
if (node.getParent() !== null && node.getParent().getChildren().length <= 1) {
if (!isTopLevelNode(node) && node.getParent().getChildren().length <= 1) {
node.getParent().folder = false;
node.getParent().renderTitle();
}
@@ -69,27 +69,30 @@ const treeChanges = (function() {
next = node.getPrevSibling();
}
if (!next) {
if (!next && !isTopLevelNode(node)) {
next = node.getParent();
}
node.remove();
// activate next element after this one is deleted so we don't lose focus
next.setActive();
if (next) {
// activate next element after this one is deleted so we don't lose focus
next.setActive();
noteTree.setCurrentNotePathToHash(next);
}
noteTree.setCurrentNotePathToHash(next);
noteTree.reload();
}
async function moveNodeUpInHierarchy(node) {
if (node.getParent() === null) {
if (isTopLevelNode(node)) {
return;
}
await server.put('notes/' + node.data.note_tree_id + '/move-after/' + node.getParent().data.note_tree_id);
if (node.getParent() !== null && node.getParent().getChildren().length <= 1) {
if (!isTopLevelNode(node) && node.getParent().getChildren().length <= 1) {
node.getParent().folder = false;
node.getParent().renderTitle();
}
@@ -98,11 +101,13 @@ const treeChanges = (function() {
}
function changeNode(node, func) {
assertArguments(node.data.parent_note_id, node.data.note_id);
noteTree.removeParentChildRelation(node.data.parent_note_id, node.data.note_id);
func(node);
node.data.parent_note_id = node.getParent() === null ? 'root' : node.getParent().data.note_id;
node.data.parent_note_id = isTopLevelNode(node) ? 'root' : node.getParent().data.note_id;
noteTree.setParentChildRelation(node.data.note_tree_id, node.data.parent_note_id, node.data.note_id);