better conflict detection

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

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