fixes #9 #11 #19 #23

Author: Vedran Opacic

.jshintrc

@@ -14,6 +14,7 @@
   "globals": {
     "document": true,
     "window": true,
-    "jQuery": true
+    "jQuery": true,
+    "$": true
   }
 }

Gruntfile.js

@@ -1,39 +1,67 @@
 'use strict';
 
-module.exports = function (grunt) {
-  // Show elapsed time at the end
-  require('time-grunt')(grunt);
-  // Load all grunt tasks
-  require('load-grunt-tasks')(grunt);
+module.exports = function(grunt) {
+    // Show elapsed time at the end
+    require('time-grunt')(grunt);
+    // Load all grunt tasks
+    require('load-grunt-tasks')(grunt);
 
-  // Project configuration.
-  grunt.initConfig({
-    jshint: {
-      options: {
-        jshintrc: '.jshintrc',
-        reporter: require('jshint-stylish')
-      },
-      dist: {
-        src: ['dist/bootstrap-session-timeout.js']
-      }
-    },
-    watch: {
-      dist: {
-        files: '<%= jshint.dist.src %>',
-        tasks: ['jshint:dist']
-      }
-    },
-    uglify: {
-        dist: {
-          files: {
-            'dist/bootstrap-session-timeout.min.js': ['<%= jshint.dist.src %>']
-          }
+    // Project configuration.
+    grunt.initConfig({
+        connect: {
+            options: {
+                port: 9000,
+                // Enable hostname '0.0.0.0' to access the server from outside.
+                hostname: '0.0.0.0',
+                livereload: 36729
+            },
+            livereload: {
+                options: {
+                    open: 'http://localhost:9000',
+                    middleware: function(connect) {
+                        return [
+                            connect.static('./')
+                        ];
+                    }
+                }
+            }
+        },
+        jshint: {
+            options: {
+                jshintrc: '.jshintrc',
+                reporter: require('jshint-stylish')
+            },
+            dist: {
+                src: ['dist/bootstrap-session-timeout.js']
+            }
+        },
+        watch: {
+            dist: {
+                files: '<%= jshint.dist.src %>',
+                tasks: ['jshint:dist']
+            },
+            livereload: {
+                options: {
+                    livereload: '<%= connect.options.livereload %>'
+                },
+                files: [
+                    '*.html',
+                    'examples/*.html',
+                    'dist/*.js'
+                ]
+            }
+        },
+        uglify: {
+            dist: {
+                files: {
+                    'dist/bootstrap-session-timeout.min.js': ['<%= jshint.dist.src %>']
+                }
+            }
         }
-      }
-  });
+    });
 
-  // Default task.
-  grunt.registerTask('default', ['jshint']);
-  grunt.registerTask('dev', ['watch']);
-  grunt.registerTask('min', ['jshint', 'uglify']);
+    // Default task.
+    grunt.registerTask('default', ['jshint']);
+    grunt.registerTask('dev', ['connect:livereload', 'watch']);
+    grunt.registerTask('min', ['jshint', 'uglify']);
 };

dist/bootstrap-session-timeout.js

@@ -5,11 +5,11 @@
  * Copyright (c) 2014 Vedran Opacic
  * Licensed under the MIT license.
  */
-/*jshint multistr: true */
-'use strict';
 
 (function($) {
-    jQuery.sessionTimeout = function(options) {
+    /*jshint multistr: true */
+    'use strict';
+    $.sessionTimeout = function(options) {
         var defaults = {
             title: 'Your Session is About to Expire!',
             message: 'Your session is about to expire.',
@@ -52,7 +52,7 @@
         if (typeof opt.onWarn !== 'function') {
             // If opt.countdownMessage is defined add a coundown timer message to the modal dialog
             var countdownMessage = opt.countdownMessage ?
-            '<p>' + opt.countdownMessage.replace(/{timer}/g, '<span class="countdown-holder"></span>') + '</p>' : '';
+                '<p>' + opt.countdownMessage.replace(/{timer}/g, '<span class="countdown-holder"></span>') + '</p>' : '';
             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%;"> \
@@ -94,15 +94,25 @@
 
         // Reset timer on any of these events
         if (!opt.ignoreUserActivity) {
-            $(document).on('keyup mouseup mousemove touchend touchmove', function() {
+            var mousePosition = [-1, -1];
+            $(document).on('keyup mouseup mousemove touchend touchmove', function(e) {
+                if (e.type === 'mousemove') {
+                    // Solves mousemove even when mouse not moving issue on Chrome:
+                    // https://code.google.com/p/chromium/issues/detail?id=241476
+                    if (e.clientX === mousePosition[0] && e.clientY === mousePosition[1]) {
+                        return;
+                    }
+                    mousePosition[0] = e.clientX;
+                    mousePosition[1] = e.clientY;
+                }
                 startSessionTimer();
 
                 // If they moved the mouse not only reset the counter
                 // but remove the modal too!
-                if( $('#session-timeout-dialog').length > 0 && 
-                    $('#session-timeout-dialog').data('bs.modal').isShown )
-                {
-                   // http://stackoverflow.com/questions/11519660/twitter-bootstrap-modal-backdrop-doesnt-disappear
+                if ($('#session-timeout-dialog').length > 0 &&
+                    $('#session-timeout-dialog').data('bs.modal') &&
+                    $('#session-timeout-dialog').data('bs.modal').isShown) {
+                    // http://stackoverflow.com/questions/11519660/twitter-bootstrap-modal-backdrop-doesnt-disappear
                     $('#session-timeout-dialog').modal('hide');
                     $('body').removeClass('modal-open');
                     $('div.modal-backdrop').remove();
@@ -203,7 +213,9 @@
                 var minLeft = Math.floor(secondsLeft / 60);
                 var secRemain = secondsLeft % 60;
                 var countTxt = minLeft > 0 ? minLeft + 'm' : '';
-                if (countTxt.length > 0) { countTxt += ' '; }
+                if (countTxt.length > 0) {
+                    countTxt += ' ';
+                }
                 countTxt += secRemain + 's';
                 countdownEl.text(countTxt);
             } else {

dist/bootstrap-session-timeout.min.js

@@ -55,11 +55,11 @@ <h3>Session Status:</h3>
         redirAfter: 20000,
         onStart: function () {
             $('.jumbotron').css('background', '#398439').find('p').addClass('hidden');
-            $('#fine').removeClass('hidden')
+            $('#fine').removeClass('hidden');
         },
         onWarn: function () {
             $('.jumbotron').css('background', '#b92c28').find('p').addClass('hidden');
-            $('#warn').removeClass('hidden')
+            $('#warn').removeClass('hidden');
         },
         onRedir: function (opt) {
             window.location = opt.logoutUrl;

examples/custom-callback.html

@@ -29,6 +29,7 @@
   ],
   "devDependencies": {
     "bower": "^1.3.5",
+    "grunt-contrib-connect": "*",
     "grunt-contrib-jshint": "~0.7.0",
     "grunt-contrib-uglify": "~0.3.1",
     "grunt-contrib-watch": "~0.5.0",