zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-21 08:06:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix closing of context menu on FF66, closes #468

Browse source 
(cherry picked from commit 3c56d29fca)
This commit is contained in:
zadam 2019-03-28 20:54:17 +01:00
parent b4c6d9f800
commit 27cee1cf33
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/public/javascripts/services/context_menu.js
View file

@ -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
}

3
src/public/javascripts/services/tree.js
View file

@ -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);