From 77ed57d5e16d0b7da10f52fad356b28517a0f616 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Tue, 6 Oct 2020 14:34:49 +0200 Subject: [PATCH] improved message fadeout behaviour --- .gitignore | 1 + resources/css/style.css | 3 +-- resources/js/plan.js | 16 +++++++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 823b0fd..fefddc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /Debug/ *.pyc +*.log /bin/ /target/ /default.* diff --git a/resources/css/style.css b/resources/css/style.css index b48d714..c533a4a 100644 --- a/resources/css/style.css +++ b/resources/css/style.css @@ -110,7 +110,6 @@ svg circle{ } #messages{ - display: none; position: fixed; bottom: 5px; right: 5px; @@ -199,4 +198,4 @@ fieldset{ float: left; border: 1px solid black; border-radius: 5px; -} \ No newline at end of file +} diff --git a/resources/js/plan.js b/resources/js/plan.js index 7804ec7..09c8a0c 100644 --- a/resources/js/plan.js +++ b/resources/js/plan.js @@ -7,8 +7,11 @@ const SVG = 'svg'; const PLAN = '#plan'; const POST = 'POST'; const CU = 'cu'; +const OPAC = 100; var selected = null; var mode = null; +var messageTimer = null; +var messageOpacity = 0; function addClass(data){ parts = data.split(" "); @@ -16,7 +19,18 @@ function addClass(data){ } function addMessage(txt){ - $('#messages').html(txt).show().delay(2000).fadeOut(1); + $('#messages').html(txt); + if (messageTimer != null) window.clearInterval(messageTimer); + messageOpacity = 300; + messageTimer = setInterval(fadeMessage,100); +} + +function fadeMessage(){ + messageOpacity -= 10; + if (messageOpacity < 1) window.clearInterval(messageTimer); + var o = messageOpacity; + if (o>OPAC) o=OPAC; + $('#messages').css('opacity',o/OPAC); } function addTile(x,y){