gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

clipboard is now owned by note tree

Browse Source
This commit is contained in:
azivner 2017-11-04 19:49:26 -04:00
parent 19c5404d02
commit dfaa59b0a9
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/javascripts/context_menu.js
View File

@ -4,23 +4,23 @@ const contextMenu = (function() {
const treeEl = $("#tree"); const treeEl = $("#tree");
function pasteAfter(node) { function pasteAfter(node) {
const subjectNode = getNodeByKey(glob.clipboardNoteId); const subjectNode = getNodeByKey(noteTree.getClipboardNoteId());
moveAfterNode(subjectNode, node); moveAfterNode(subjectNode, node);
glob.clipboardNoteId = null; noteTree.setClipboardNoteId(null);
} }
function pasteInto(node) { function pasteInto(node) {
const subjectNode = getNodeByKey(glob.clipboardNoteId); const subjectNode = getNodeByKey(noteTree.getClipboardNoteId());
moveToNode(subjectNode, node); moveToNode(subjectNode, node);
glob.clipboardNoteId = null; noteTree.setClipboardNoteId(null);
} }
function cut(node) { function cut(node) {
glob.clipboardNoteId = node.key; noteTree.setClipboardNoteId(node.key);
} }
const contextMenuSettings = { const contextMenuSettings = {
@ -42,8 +42,8 @@ const contextMenu = (function() {
beforeOpen: (event, ui) => { beforeOpen: (event, ui) => {
const node = $.ui.fancytree.getNode(ui.target); const node = $.ui.fancytree.getNode(ui.target);
// Modify menu entries depending on node status // Modify menu entries depending on node status
treeEl.contextmenu("enableEntry", "pasteAfter", glob.clipboardNoteId !== null); treeEl.contextmenu("enableEntry", "pasteAfter", noteTree.getClipboardNoteId() !== null);
treeEl.contextmenu("enableEntry", "pasteInto", glob.clipboardNoteId !== null); treeEl.contextmenu("enableEntry", "pasteInto", noteTree.getClipboardNoteId() !== null);
// Activate node on right-click // Activate node on right-click
node.setActive(); node.setActive();

14
public/javascripts/note_tree.js
View File

@ -4,14 +4,22 @@ const noteTree = (function() {
const noteDetailEl = $('#note-detail'); const noteDetailEl = $('#note-detail');
const treeEl = $("#tree"); const treeEl = $("#tree");
let treeLoadTime = null; let treeLoadTime = null;
let clipboardNoteId = null;
glob.allNoteIds = []; glob.allNoteIds = [];
glob.clipboardNoteId = null;
function getTreeLoadTime() { function getTreeLoadTime() {
return treeLoadTime; return treeLoadTime;
} }
function getClipboardNoteId() {
return clipboardNoteId;
}
function setClipboardNoteId(cbNoteId) {
clipboardNoteId = cbNoteId;
}
function prepareNoteTree(notes) { function prepareNoteTree(notes) {
for (const note of notes) { for (const note of notes) {
glob.allNoteIds.push(note.note_id); glob.allNoteIds.push(note.note_id);
@ -284,9 +292,11 @@ const noteTree = (function() {
return { return {
getTreeLoadTime, getTreeLoadTime,
getClipboardNoteId,
setClipboardNoteId,
loadTree, loadTree,
collapseTree, collapseTree,
scrollToCurrentNote, scrollToCurrentNote,
toggleSearch toggleSearch,
}; };
})(); })();