X-Git-Url: http://git.datanom.net/qtadmin.git/blobdiff_plain/e0ed91d70278c4492826a04f65aa6aaefd8043b0..b70a3d7456c935ce66ccdbfffea7a4179bb8a29b:/js/timer.js

diff --git a/js/timer.js b/js/timer.js
index d166ffd..41d6e3f 100644
--- a/js/timer.js
+++ b/js/timer.js
@@ -1,4 +1,4 @@
-/* vim: set ts=4 tw=4 sw=4 noet: */
+/* vim: set ts=4 tw=0 sw=4 noet: */
 var timerRef=setInterval(function(){myTimer()}, 1000);
 var timeStart = new Date().getTime() + timeout;
 var last = -1;
@@ -8,23 +8,23 @@ function myTimer() {
     var expire = timeStart - elapsed;
     var timeLeft = Math.round(((expire % 86400000) % 3600000) / 60000);
 
-    if (timeLeft < 1) {
+    if (timeLeft < 0) {
         clearInterval(timerRef);
         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 = 'Expired';
-            console.log('Session soon to expire');
+            timeLeft = '< ' + timeLeft + ' min';
+            /*console.log('Session soon to expire');*/
             document.getElementById("time").style.background = "red";
             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);
+            /*console.log('Session valid < ' + timeLeft);*/
             timeLeft = '< ' + timeLeft + ' min';
             document.getElementById("timer").innerHTML = timeLeft;
         }