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 context submenus, closes #810

Browse source
This commit is contained in:
zadam 2020-01-07 20:53:41 +01:00
parent 24c5388e0c
commit ccaa9eae3a
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -76,8 +76,7 @@ async function initContextMenu(event, contextMenu) {
// in such case we'll position it above click coordinates so it will fit into client // in such case we'll position it above click coordinates so it will fit into client
const clickPosition = event.pageY; const clickPosition = event.pageY;
const clientHeight = document.documentElement.clientHeight; const clientHeight = document.documentElement.clientHeight;
const contextMenuHeight = $contextMenuContainer.height(); const contextMenuHeight = $contextMenuContainer.outerHeight() + 30;
let top; let top;
if (clickPosition + contextMenuHeight > clientHeight) { if (clickPosition + contextMenuHeight > clientHeight) {

2
src/public/stylesheets/desktop.css
View file

@ -110,7 +110,7 @@ body {
#context-menu-container { #context-menu-container {
max-height: 100vh; max-height: 100vh;
overflow: auto; /* make it scrollable when exceeding total height of the window */ /* !!! Cannot set overflow: auto, submenus will break !!! */
} }
#context-menu-container, #context-menu-container .dropdown-menu { #context-menu-container, #context-menu-container .dropdown-menu {

2
src/services/notes.js
View file

@ -490,6 +490,8 @@ async function eraseDeletedNotes() {
SET isErased = 1, SET isErased = 1,
title = NULL title = NULL
WHERE isErased = 0 AND noteId IN (???)`, noteIdsToErase); WHERE isErased = 0 AND noteId IN (???)`, noteIdsToErase);
log.info(`Erased notes: ${JSON.stringify(noteIdsToErase)}`);
} }
async function duplicateNote(noteId, parentNoteId) { async function duplicateNote(noteId, parentNoteId) {