Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-08-31 03:46:43 +02:00
Code Issues Packages Projects Releases Activity

better conflict detection

Browse Source
This commit is contained in:
azivner
2018-01-01 22:28:19 -05:00
parent 3585982758
commit ad7fa5e096
5 changed files with 97 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/javascripts/context_menu.js
View File

@@ -11,7 +11,7 @@ const contextMenu = (function() {
for (const nodeKey of clipboardIds) {
const subjectNode = treeUtils.getNodeByKey(nodeKey);
treeChanges.moveAfterNode(subjectNode, node);
treeChanges.moveAfterNode([subjectNode], node);
}
clipboardIds = [];
@@ -37,7 +37,7 @@ const contextMenu = (function() {
for (const nodeKey of clipboardIds) {
const subjectNode = treeUtils.getNodeByKey(nodeKey);
treeChanges.moveToNode(subjectNode, node);
treeChanges.moveToNode([subjectNode], node);
}
clipboardIds = [];
@@ -47,7 +47,6 @@ const contextMenu = (function() {
for (const noteId of clipboardIds) {
treeChanges.cloneNoteTo(noteId, node.data.note_id);
}
// copy will keep clipboardIds and clipboardMode so it's possible to paste into multiple places
}
else if (clipboardIds.length === 0) {

6
public/javascripts/note_tree.js
View File

@@ -478,22 +478,16 @@ const noteTree = (function() {
"ctrl+c": () => {
contextMenu.copy(getSelectedNodes());
showMessage("Note(s) copied into clipboard.");
return false;
},
"ctrl+x": () => {
contextMenu.cut(getSelectedNodes());
showMessage("Note(s) cut into clipboard.");
return false;
},
"ctrl+v": node => {
contextMenu.pasteInto(node);
showMessage("Note(s) pasted from clipboard into current note.");
return false;
},
"ctrl+return": node => {

28
public/javascripts/tree_changes.js
View File

@@ -3,7 +3,12 @@
const treeChanges = (function() {
async function moveBeforeNode(nodesToMove, beforeNode) {
for (const nodeToMove of nodesToMove) {
await server.put('notes/' + nodeToMove.data.note_tree_id + '/move-before/' + beforeNode.data.note_tree_id);
const resp = await server.put('notes/' + nodeToMove.data.note_tree_id + '/move-before/' + beforeNode.data.note_tree_id);
if (!resp.success) {
alert(resp.message);
return;
}
changeNode(nodeToMove, node => node.moveTo(beforeNode, 'before'));
}
@@ -11,7 +16,12 @@ const treeChanges = (function() {
async function moveAfterNode(nodesToMove, afterNode) {
for (const nodeToMove of nodesToMove) {
await server.put('notes/' + nodeToMove.data.note_tree_id + '/move-after/' + afterNode.data.note_tree_id);
const resp = await server.put('notes/' + nodeToMove.data.note_tree_id + '/move-after/' + afterNode.data.note_tree_id);
if (!resp.success) {
alert(resp.message);
return;
}
changeNode(nodeToMove, node => node.moveTo(afterNode, 'after'));
}
@@ -31,7 +41,12 @@ const treeChanges = (function() {
async function moveToNode(nodesToMove, toNode) {
for (const nodeToMove of nodesToMove) {
await server.put('notes/' + nodeToMove.data.note_tree_id + '/move-to/' + toNode.data.note_id);
const resp = await server.put('notes/' + nodeToMove.data.note_tree_id + '/move-to/' + toNode.data.note_id);
if (!resp.success) {
alert(resp.message);
return;
}
changeNode(nodeToMove, node => {
// first expand which will force lazy load and only then move the node
@@ -100,7 +115,12 @@ const treeChanges = (function() {
return;
}
await server.put('notes/' + node.data.note_tree_id + '/move-after/' + node.getParent().data.note_tree_id);
const resp = await server.put('notes/' + node.data.note_tree_id + '/move-after/' + node.getParent().data.note_tree_id);
if (!resp.success) {
alert(resp.message);
return;
}
if (!isTopLevelNode(node) && node.getParent().getChildren().length <= 1) {
node.getParent().folder = false;