Fix bug in session handler

[qtadmin.git] / js / timer.js

diff --git a/js/timer.js b/js/timer.js
index 482565577923f1045d20768cee0bcca981bdb26f..f68f0841f11d279fd19defce6ff5ccd026569796 100644 (file)
--- a/js/timer.js
+++ b/js/timer.js
@@ -13,7 +13,7 @@ function myTimer() {
         console.log('Session expired, reload page');
         last = -1;
         location.reload();
         console.log('Session expired, reload page');
         last = -1;
         location.reload();

-    } else if (timeLeft < 2) {
+    } else if (timeLeft == 1) {

         if (timeLeft < last || last == -1) {
             last = timeLeft;
             timeLeft = '< ' + timeLeft + ' min';
         if (timeLeft < last || last == -1) {
             last = timeLeft;
             timeLeft = '< ' + timeLeft + ' min';


@@ -22,7 +22,7 @@ function myTimer() {
             document.getElementById("timer").innerHTML = timeLeft;
         }
     } else {
             document.getElementById("timer").innerHTML = timeLeft;
         }
     } else {

-        if (timeLeft < last || last == -1) {
+        if ((timeLeft < last && timeLeft > 0) || last == -1) {

             last = timeLeft;
             console.log('Session valid < ' + timeLeft);
             timeLeft = '< ' + timeLeft + ' min';
             last = timeLeft;
             console.log('Session valid < ' + timeLeft);
             timeLeft = '< ' + timeLeft + ' min';