From b2103a3c75bff8e351718591bdd6f1771f4077a3 Mon Sep 17 00:00:00 2001 From: Michael Rasmussen Date: Thu, 4 Jun 2015 00:56:50 +0200 Subject: [PATCH] Fix timer --- js/timer.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/js/timer.js b/js/timer.js index 73ecda6..45883c6 100644 --- a/js/timer.js +++ b/js/timer.js @@ -1,7 +1,7 @@ /* vim: set ts=4 tw=4 sw=4 noet: */ var timerRef=setInterval(function(){myTimer()}, 1000); var timeStart = new Date().getTime() + timeout; -var last = 0; +var last = -1; function myTimer() { var elapsed = new Date().getTime(); @@ -11,15 +11,18 @@ function myTimer() { if (timeLeft < 0) { clearInterval(timerRef); console.log('Session expired, reload page'); - last = 0; + last = -1; location.reload(); } else if (timeLeft < 1) { - timeLeft = 'Expired'; - console.log('Session valid < 1'); - document.getElementById("time").style.background = "red"; - document.getElementById("timer").innerHTML = timeLeft; + if (timeLeft < last || last == -1) { + last = timeLeft; + timeLeft = 'Expired'; + console.log('Session valid < 1'); + document.getElementById("time").style.background = "red"; + document.getElementById("timer").innerHTML = timeLeft; + } } else { - if (timeLeft > last) { + if (timeLeft < last || last == -1) { last = timeLeft; console.log('Session valid < ' + timeLeft); timeLeft = '< ' + timeLeft + ' min'; -- 2.39.2