sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updating data model after change parent of the note

pull/255/head
azivner 2017-12-17 16:28:13 +07:00
parent cf7ab2b8d6
commit 42dfbaa986
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/javascripts/note_tree.js
Unescape Escape View File

@ -93,6 +93,15 @@ const noteTree = (function() {
});
}
function removeParentChildRelation(parentNoteId, childNoteId) {
const key = parentNoteId + "-" + childNoteId;
delete parentChildToNoteTreeId[key];
parentToChildren[parentNoteId] = parentToChildren[parentNoteId].filter(noteId => noteId !== childNoteId);
childToParents[childNoteId] = childToParents[childNoteId].filter(noteId => noteId !== parentNoteId);
}
function setParentChildRelation(noteTreeId, parentNoteId, childNoteId) {
const key = parentNoteId + "-" + childNoteId;
@ -653,6 +662,8 @@ const noteTree = (function() {
createNewTopLevelNote,
createNote,
setPrefix,
getNotePathTitle
getNotePathTitle,
removeParentChildRelation,
setParentChildRelation
};
})();

32
public/javascripts/tree_changes.js
Unescape Escape View File

@ -4,17 +4,13 @@ const treeChanges = (function() {
async function moveBeforeNode(node, beforeNode) {
await server.put('notes/' + node.data.note_tree_id + '/move-before/' + beforeNode.data.note_tree_id);
node.moveTo(beforeNode, 'before');
noteTree.setCurrentNotePathToHash(node);
changeNode(node, node => node.moveTo(beforeNode, 'before'));
}
async function moveAfterNode(node, afterNode) {
await server.put('notes/' + node.data.note_tree_id + '/move-after/' + afterNode.data.note_tree_id);
node.moveTo(afterNode, 'after');
noteTree.setCurrentNotePathToHash(node);
changeNode(node, node => node.moveTo(afterNode, 'after'));
}
// beware that first arg is noteId and second is noteTreeId!
@ -32,14 +28,14 @@ const treeChanges = (function() {
async function moveToNode(node, toNode) {
await server.put('notes/' + node.data.note_tree_id + '/move-to/' + toNode.data.note_id);
node.moveTo(toNode);
toNode.setExpanded(true);
changeNode(node, node => {
node.moveTo(toNode);
toNode.folder = true;
toNode.renderTitle();
toNode.setExpanded(true);
noteTree.setCurrentNotePathToHash(node);
toNode.folder = true;
toNode.renderTitle();
});
}
async function cloneNoteTo(childNoteId, parentNoteId) {
@ -96,7 +92,17 @@ const treeChanges = (function() {
node.getParent().renderTitle();
}
node.moveTo(node.getParent(), 'after');
changeNode(node, node => node.moveTo(node.getParent(), 'after'));
}
function changeNode(node, func) {
noteTree.removeParentChildRelation(node.data.note_pid, node.data.note_id);
func(node);
node.data.note_pid = node.getParent() === null ? 'root' : node.getParent().data.note_id;
noteTree.setParentChildRelation(node.data.note_tree_id, node.data.note_pid, node.data.note_id);
noteTree.setCurrentNotePathToHash(node);
}