From 27cee1cf3361d9004bc474d6118ba60a668b9b8a Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 28 Mar 2019 20:54:17 +0100 Subject: [PATCH 1/7] fix closing of context menu on FF66, closes #468 (cherry picked from commit 3c56d29fca16911dc587c5ab6ed221df9005895a) --- .../javascripts/services/context_menu.js | 18 ++++++++++++++++-- src/public/javascripts/services/tree.js | 3 +++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/public/javascripts/services/context_menu.js b/src/public/javascripts/services/context_menu.js index d3ac95686..999abc28b 100644 --- a/src/public/javascripts/services/context_menu.js +++ b/src/public/javascripts/services/context_menu.js @@ -1,5 +1,7 @@ const $contextMenuContainer = $("#context-menu-container"); +let dateContextMenuOpenedMs = 0; + function initContextMenu(event, itemContainer, selectContextMenuItem) { event.stopPropagation(); @@ -55,6 +57,8 @@ function initContextMenu(event, itemContainer, selectContextMenuItem) { top = event.pageY - 10; } + dateContextMenuOpenedMs = Date.now(); + $contextMenuContainer.css({ display: "block", top: top, @@ -62,8 +66,18 @@ function initContextMenu(event, itemContainer, selectContextMenuItem) { }).addClass("show"); } -$(document).click(() => $contextMenuContainer.hide()); +$(document).click(() => hideContextMenu()); + +function hideContextMenu() { + // this date checking comes from change in FF66 - https://github.com/zadam/trilium/issues/468 + // "contextmenu" event also triggers "click" event which depending on the timing can close just opened context menu + // we might filter out right clicks, but then it's better if even right clicks close the context menu + if (Date.now() - dateContextMenuOpenedMs > 300) { + $contextMenuContainer.hide(); + } +} export default { - initContextMenu + initContextMenu, + hideContextMenu } \ No newline at end of file diff --git a/src/public/javascripts/services/tree.js b/src/public/javascripts/services/tree.js index ebb7f9922..4db2f0617 100644 --- a/src/public/javascripts/services/tree.js +++ b/src/public/javascripts/services/tree.js @@ -417,6 +417,9 @@ function initFancyTree(tree) { const node = data.node; const noteId = node.data.noteId; + // click event won't propagate so let's close context menu manually + contextMenuWidget.hideContextMenu(); + setCurrentNotePathToHash(node); noteDetailService.switchToNote(noteId); From efac7701ebe05ccea59365957dea4d0b6de9e525 Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 28 Mar 2019 22:31:59 +0100 Subject: [PATCH 2/7] release 0.30.6 --- src/services/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/build.js b/src/services/build.js index a06001521..1a0fc856c 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2019-03-12T22:21:35+01:00", buildRevision: "0144dc12dfe46fc9e5d15d64cdd8c9e3f7398637" }; +module.exports = { buildDate:"2019-03-28T22:31:59+01:00", buildRevision: "27cee1cf3361d9004bc474d6118ba60a668b9b8a" }; From 0610576e5a6510519a44479267ba916d1c0d3ea9 Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 28 Mar 2019 22:35:36 +0100 Subject: [PATCH 3/7] 0.30.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c793710e..e880cb099 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.30.5", + "version": "0.30.6", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { From 3820384f51159728d756f6d7fc8d4f1d97b933b9 Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 28 Mar 2019 22:35:43 +0100 Subject: [PATCH 4/7] release 0.30.6 --- src/services/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/build.js b/src/services/build.js index 1a0fc856c..a961c45e3 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2019-03-28T22:31:59+01:00", buildRevision: "27cee1cf3361d9004bc474d6118ba60a668b9b8a" }; +module.exports = { buildDate:"2019-03-28T22:35:43+01:00", buildRevision: "0610576e5a6510519a44479267ba916d1c0d3ea9" }; From a07479cd5a9af204fb8c8d213625173437fa07aa Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 28 Mar 2019 22:49:34 +0100 Subject: [PATCH 5/7] release 0.30.6 --- src/services/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/build.js b/src/services/build.js index a961c45e3..4060d2d6e 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2019-03-28T22:35:43+01:00", buildRevision: "0610576e5a6510519a44479267ba916d1c0d3ea9" }; +module.exports = { buildDate:"2019-03-28T22:49:34+01:00", buildRevision: "3820384f51159728d756f6d7fc8d4f1d97b933b9" }; From b2052a6ccda31712492cffc899ee132b0229613b Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 28 Mar 2019 23:01:52 +0100 Subject: [PATCH 6/7] release 0.30.6 --- src/services/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/build.js b/src/services/build.js index 4060d2d6e..a48d280ba 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2019-03-28T22:49:34+01:00", buildRevision: "3820384f51159728d756f6d7fc8d4f1d97b933b9" }; +module.exports = { buildDate:"2019-03-28T23:01:52+01:00", buildRevision: "a07479cd5a9af204fb8c8d213625173437fa07aa" }; From c2e3a3fe04f5d86e3d3cac96cadf0fcc4bc1a916 Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 28 Mar 2019 23:17:24 +0100 Subject: [PATCH 7/7] release 0.30.6 --- src/services/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/build.js b/src/services/build.js index a48d280ba..392a6cc7f 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2019-03-28T23:01:52+01:00", buildRevision: "a07479cd5a9af204fb8c8d213625173437fa07aa" }; +module.exports = { buildDate:"2019-03-28T23:17:24+01:00", buildRevision: "b2052a6ccda31712492cffc899ee132b0229613b" };