Merge pull request #13 from molecularbear/smart-countdown

Add countdownSmart option

Author: vedraan

README.md

@@ -136,13 +136,22 @@ Default: `false`
 
 If `true`, this will launch the Bootstrap warning dialog / redirect (or callback functions) in a set amounts of time regardless of user activity. This in turn makes the plugin act much like the [jquery-sessionTimeout-bootstrap by maxfierke](https://github.com/maxfierke/jquery-sessionTimeout-bootstrap) plugin.
 
+**countdownSmart**
+
+Type: `Boolean`
+
+Default: `false`
+
+If `true`, displays minutes as well as seconds in the countdown timer (e.g. "3m 14s").
+Displays only seconds when timer is under one minute (e.g. "42s").
+
 **countdownMessage**
 
 Type: `String` or `Boolean`
 
 Default: `false`
 
-If you want a custom sentence to appear in the warning dialog with a timer showing the seconds remaining, use this option. Example: `countdownMessage: 'Redirecting in {timer} seconds.'` Place the `{timer}` string where you want the numeric countdown (seconds) to appear. Another example: `countdownMessage: '{timer} seconds remaining.'`. Can be combined with countdownBar option or used independently.
+If you want a custom sentence to appear in the warning dialog with a timer showing the seconds remaining, use this option. Example: `countdownMessage: 'Redirecting in {timer}.'` Place the `{timer}` string where you want the numeric countdown to appear. Another example: `countdownMessage: '{timer} remaining.'`. Can be combined with countdownBar option or used independently.
 
 **countdownBar**
 

dist/bootstrap-session-timeout.js

@@ -29,7 +29,8 @@
             onWarn: false,
             onRedir: false,
             countdownMessage: false,
-            countdownBar: false
+            countdownBar: false,
+            countdownSmart: false
         };
 
         var opt = defaults,
@@ -55,7 +56,7 @@
             var coundownBarHtml = opt.countdownBar ?
                 '<div class="progress"> \
                   <div class="progress-bar progress-bar-striped countdown-bar active" role="progressbar" style="min-width: 15px; width: 100%;"> \
-                    <span class="countdown-holder"></span><span>s</span> \
+                    <span class="countdown-holder"></span> \
                   </div> \
                 </div>' : '';
 
@@ -196,7 +197,18 @@
                 countdown.percentLeft = Math.floor(countdown.timeLeft / (opt.redirAfter / 1000) * 100);
             }
             // Set countdown message time value
-            $('.countdown-holder').text(countdown.timeLeft);
+            var countdownEl = $('.countdown-holder');
+            var secondsLeft = countdown.timeLeft >= 0 ? countdown.timeLeft : 0;
+            if (opt.countdownSmart) {
+                var minLeft = Math.floor(secondsLeft / 60);
+                var secRemain = secondsLeft % 60;
+                var countTxt = minLeft > 0 ? minLeft + 'm' : '';
+                if (countTxt.length > 0) { countTxt += ' '; }
+                countTxt += secRemain + 's';
+                countdownEl.text(countTxt);
+            } else {
+                countdownEl.text(secondsLeft + "s");
+            }
 
             // Set countdown message time value
             if (opt.countdownBar) {