From 62a250a7fcc8df0d80dfa6521c3cabd373462932 Mon Sep 17 00:00:00 2001 From: azivner Date: Sun, 18 Nov 2018 20:57:52 +0100 Subject: [PATCH] fixes for tooltip handling --- Dockerfile | 2 +- bin/build-server.sh | 2 +- src/public/javascripts/services/tooltip.js | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5e5a7de87..7b36b9a0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:10.12.0 +FROM node:10.13.0 RUN apt-get update && apt-get install -y nasm diff --git a/bin/build-server.sh b/bin/build-server.sh index 420818f61..ae7803e4a 100755 --- a/bin/build-server.sh +++ b/bin/build-server.sh @@ -7,7 +7,7 @@ fi VERSION=$1 PKG_DIR=dist/trilium-linux-x64-server -NODE_VERSION=10.12.0 +NODE_VERSION=10.13.0 rm -r $PKG_DIR mkdir $PKG_DIR diff --git a/src/public/javascripts/services/tooltip.js b/src/public/javascripts/services/tooltip.js index 6bcd881b4..c45d3729c 100644 --- a/src/public/javascripts/services/tooltip.js +++ b/src/public/javascripts/services/tooltip.js @@ -41,6 +41,10 @@ function setupTooltip() { if ($(this).is(":hover")) { $(this).tooltip({ delay: {"show": 300, "hide": 100}, + container: 'body', + placement: 'auto', + trigger: 'manual', + boundariesElement: 'window', title: html, html: true }); @@ -50,7 +54,7 @@ function setupTooltip() { }); $(document).on("mouseleave", "a", function() { - $(this).tooltip('hide'); + $(this).tooltip('dispose'); }); // close any tooltip after click, this fixes the problem that sometimes tooltips remained on the screen