From 94c904fb4081e0dcf3fab1d0b591f3b12ba42d5c Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 26 Nov 2019 19:42:47 +0100 Subject: [PATCH] fix context menu over root, closes #726 --- .idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml | 2 +- package-lock.json | 2 +- src/public/javascripts/services/tree_context_menu.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml index af7acccd2..fd8b7208b 100644 --- a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml +++ b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml @@ -1,6 +1,6 @@ - + 3.25.1 diff --git a/package-lock.json b/package-lock.json index 2b422cf18..5a19e325c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.37.4", + "version": "0.37.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/public/javascripts/services/tree_context_menu.js b/src/public/javascripts/services/tree_context_menu.js index f565b8fff..69a0828ec 100644 --- a/src/public/javascripts/services/tree_context_menu.js +++ b/src/public/javascripts/services/tree_context_menu.js @@ -42,7 +42,7 @@ class TreeContextMenu { || (selNodes.length === 1 && selNodes[0] === this.node); const notSearch = note.type !== 'search'; - const parentNotSearch = parentNote.type !== 'search'; + const parentNotSearch = !parentNote || parentNote.type !== 'search'; const insertNoteAfterEnabled = isNotRoot && !isHoisted && parentNotSearch; return [ @@ -79,7 +79,7 @@ class TreeContextMenu { { title: "Paste after", cmd: "pasteAfter", uiIcon: "paste", enabled: !clipboard.isClipboardEmpty() && isNotRoot && !isHoisted && parentNotSearch && noSelectedNotes }, { title: "Duplicate note here", cmd: "duplicateNote", uiIcon: "empty", - enabled: noSelectedNotes && parentNotSearch && (!note.isProtected || protectedSessionHolder.isProtectedSessionAvailable()) }, + enabled: noSelectedNotes && parentNotSearch && isNotRoot && !isHoisted && (!note.isProtected || protectedSessionHolder.isProtectedSessionAvailable()) }, { title: "----" }, { title: "Export", cmd: "export", uiIcon: "empty", enabled: notSearch && noSelectedNotes },