Fixed time display. Added password field clearing.

LinearSoft · May 28, 2016 · 78d33bd · 78d33bd
1 parent 4c11f7c
commit 78d33bd
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "jquery-idleTimeout-plus",
   "description": "User idle detector with session keep-alive, warning dialog, lock screen, url redirection and support for multiple windows and tabs.",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "main": "dist/jquery-idleTimeout-plus.js",
   "authors": [
     "Jason Abraham",

diff --git a/dist/js/jquery-idleTimeout-plus-iframe.js b/dist/js/jquery-idleTimeout-plus-iframe.js
@@ -656,6 +656,7 @@
 
         stopLockTimer();
         closeLockScreen();
+        $('#jitp-lock-pass').val(''); //Don't want the password to stay in the field
         if(config.keepAliveInterval) startKeepSessionAlive();
         storeData('lockStartTime',-1);
         initIdle();
@@ -1002,7 +1003,8 @@
         }
         var hoursLeft = Math.floor(minLeft/60);
         minLeft %= 60;
-        if(minLeft <= 15 || minLeft >52) return 'about '+hoursLeft+' hours';
+        if(minLeft <= 15) return 'about '+hoursLeft+' hours';
+        if(minLeft > 52) return 'about '+(hoursLeft+1)+' hours';
         return 'about '+hoursLeft+'&frac12; hours';
     }
 

diff --git a/dist/js/jquery-idleTimeout-plus-iframe.min.js b/dist/js/jquery-idleTimeout-plus-iframe.min.js
diff --git a/dist/js/jquery-idleTimeout-plus.js b/dist/js/jquery-idleTimeout-plus.js
@@ -639,6 +639,7 @@
 
         stopLockTimer();
         closeLockScreen();
+        $('#jitp-lock-pass').val(''); //Don't want the password to stay in the field
         if(config.keepAliveInterval) startKeepSessionAlive();
         storeData('lockStartTime',-1);
         initIdle();
@@ -876,7 +877,8 @@
         }
         var hoursLeft = Math.floor(minLeft/60);
         minLeft %= 60;
-        if(minLeft <= 15 || minLeft >52) return 'about '+hoursLeft+' hours';
+        if(minLeft <= 15) return 'about '+hoursLeft+' hours';
+        if(minLeft > 52) return 'about '+(hoursLeft+1)+' hours';
         return 'about '+hoursLeft+'&frac12; hours';
     }
 

diff --git a/dist/js/jquery-idleTimeout-plus.min.js b/dist/js/jquery-idleTimeout-plus.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery-idleTimeout-plus",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "User idle detector with session keep-alive, warning dialog, lock screen, url redirection and support for multiple windows and tabs.",
   "main": "dist/jquery-idleTimeout-plus.js",
   "homepage": "https://github.com/LinearSoft/jquery-idleTimeout-plus",

diff --git a/src/jquery-idleTimeout-plus.js b/src/jquery-idleTimeout-plus.js
@@ -95,10 +95,10 @@
     /* --strip_testing_begin-- */
     var testingConfig = {
         idleTimeLimit:      30,
-        activityEvents:     'click keypress scroll wheel mousewheel',   // Remove mousemove
         warnTimeLimit:      30,
         lockTimeLimit:      60,
-        keepAliveInterval:  10
+        keepAliveInterval:  10,
+        activityEvents:     'click keypress scroll wheel mousewheel'   // Remove mousemove
     };
     /* --strip_testing_end-- */
 
@@ -664,6 +664,7 @@
         console.log('rollbackLock called');
         stopLockTimer();
         closeLockScreen();
+        $('#jitp-lock-pass').val(''); //Don't want the password to stay in the field
         if(config.keepAliveInterval) startKeepSessionAlive();
         storeData('lockStartTime',-1);
         initIdle();
@@ -1010,7 +1011,8 @@
         }
         var hoursLeft = Math.floor(minLeft/60);
         minLeft %= 60;
-        if(minLeft <= 15 || minLeft >52) return 'about '+hoursLeft+' hours';
+        if(minLeft <= 15) return 'about '+hoursLeft+' hours';
+        if(minLeft > 52) return 'about '+(hoursLeft+1)+' hours';
         return 'about '+hoursLeft+'&frac12; hours';
     }