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

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) {