From e2c6adc18ed584abf5b162c2ca88dbcd2e2ffedb Mon Sep 17 00:00:00 2001
From: Zach Kirkland <zkirkland@users.noreply.github.com>
Date: Thu, 21 Mar 2019 15:50:23 -0500
Subject: [PATCH 1/5] add more control

added options: logoutButtonCallback, keepAliveButtonCallback, activityHidesModal, resetTimerWhileModalOpen, isModalStatic.
* logoutButtonCallback, keepAliveButtonCallback (default: false)
** gives user ability to set custom callbacks for the buttons
* activityHidesModal (default: true)
** allows the user to ensure the modal does not hide on mouse/keyboard activity
* resetTimerWhileModalOpen (default: true)
** allows user to disable timer reset while the modal is open.
* isModalStatic (default: false)
** allows user to keep disable dismissal of the modal by clicking outside of the modal or pressing escape.
---
 dist/bootstrap-session-timeout.js | 58 +++++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 15 deletions(-)

diff --git a/dist/bootstrap-session-timeout.js b/dist/bootstrap-session-timeout.js
index 1d65189..64bdfea 100644
--- a/dist/bootstrap-session-timeout.js
+++ b/dist/bootstrap-session-timeout.js
@@ -14,7 +14,9 @@
             title: 'Your Session is About to Expire!',
             message: 'Your session is about to expire.',
             logoutButton: 'Logout',
+            logoutButtonCallback: false,
             keepAliveButton: 'Stay Connected',
+            keepAliveButtonCallback: false,
             keepAliveUrl: '/keep-alive',
             ajaxType: 'POST',
             ajaxData: '',
@@ -30,7 +32,10 @@
             onRedir: false,
             countdownMessage: false,
             countdownBar: false,
-            countdownSmart: false
+            countdownSmart: false,
+            activityHidesModal: true,
+            resetTimerWhileModalOpen: true,
+            isModalStatic: false
         };
 
         var opt = defaults,
@@ -60,8 +65,10 @@
                   </div> \
                 </div>' : '';
 
+            var modalStaticAttributes = opt.isModalStatic ? 'data-backdrop="static" data-keyboard="false"' : '';
+
             // Create timeout warning dialog
-            $('body').append('<div class="modal fade" id="session-timeout-dialog"> \
+            $('body').append('<div class="modal fade" id="session-timeout-dialog" ' + modalStaticAttributes + '> \
               <div class="modal-dialog"> \
                 <div class="modal-content"> \
                   <div class="modal-header"> \
@@ -82,14 +89,28 @@
              </div>');
 
             // "Logout" button click
-            $('#session-timeout-dialog-logout').on('click', function() {
-                window.location = opt.logoutUrl;
-            });
+            if (typeof opt.logoutButtonCallback !== 'function') {
+                $('#session-timeout-dialog-logout').on('click', function () {
+                    window.location = opt.logoutUrl;
+                });
+            } else {
+                $('#session-timeout-dialog-logout').on('click', function () {
+                    opt.logoutButtonCallback();
+                });
+            }
+
             // "Stay Connected" button click
-            $('#session-timeout-dialog').on('hide.bs.modal', function() {
-                // Restart session timer
-                startSessionTimer();
-            });
+            if (typeof opt.keepAliveButtonCallback !== 'function') {
+                $('#session-timeout-dialog').on('hide.bs.modal', function () {
+                    // Restart session timer
+                    startSessionTimer();
+                });
+            } else {
+                $('#session-timeout-dialog').on('hide.bs.modal', function () {
+                    opt.keepAliveButtonCallback();
+                    startSessionTimer();
+                });
+            }
         }
 
         // Reset timer on any of these events
@@ -105,23 +126,30 @@
                     mousePosition[0] = e.clientX;
                     mousePosition[1] = e.clientY;
                 }
-                startSessionTimer();
+
+                var isModalOpen = $('#session-timeout-dialog').length > 0 &&
+                                  $('#session-timeout-dialog').data('bs.modal') &&
+                                  $('#session-timeout-dialog').data('bs.modal').isShown;
+               
+                // Reset timer if the modal is not open
+                // OR
+                // if the modal is open AND the option is set to true.
+                if (!isModalOpen || (isModalOpen && opt.resetTimerWhileModalOpen)) {
+                    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') &&
-                    $('#session-timeout-dialog').data('bs.modal').isShown) {
+                if (opt.activityHidesModal === true && isModalOpen) {
                     // http://stackoverflow.com/questions/11519660/twitter-bootstrap-modal-backdrop-doesnt-disappear
                     $('#session-timeout-dialog').modal('hide');
                     $('body').removeClass('modal-open');
                     $('div.modal-backdrop').remove();
-
                 }
             });
         }
 
-        // Keeps the server side connection live, by pingin url set in keepAliveUrl option.
+        // Keeps the server side connection live, by pinging url set in keepAliveUrl option.
         // KeepAlivePinged is a helper var to ensure the functionality of the keepAliveInterval option
         var keepAlivePinged = false;
 

From 2b6c59813eaa7095c88953659e7fc0d16e4c4103 Mon Sep 17 00:00:00 2001
From: Zach Kirkland <zkirkland@users.noreply.github.com>
Date: Thu, 21 Mar 2019 15:51:16 -0500
Subject: [PATCH 2/5] Update bootstrap-session-timeout.min.js

---
 dist/bootstrap-session-timeout.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/bootstrap-session-timeout.min.js b/dist/bootstrap-session-timeout.min.js
index 5c47922..6c2765c 100644
--- a/dist/bootstrap-session-timeout.min.js
+++ b/dist/bootstrap-session-timeout.min.js
@@ -1 +1 @@
-!function(a){"use strict";a.sessionTimeout=function(b){function c(){n||(a.ajax({type:i.ajaxType,url:i.keepAliveUrl,data:i.ajaxData}),n=!0,setTimeout(function(){n=!1},i.keepAliveInterval))}function d(){clearTimeout(g),(i.countdownMessage||i.countdownBar)&&f("session",!0),"function"==typeof i.onStart&&i.onStart(i),i.keepAlive&&c(),g=setTimeout(function(){"function"!=typeof i.onWarn?a("#session-timeout-dialog").modal("show"):i.onWarn(i),e()},i.warnAfter)}function e(){clearTimeout(g),a("#session-timeout-dialog").hasClass("in")||!i.countdownMessage&&!i.countdownBar||f("dialog",!0),g=setTimeout(function(){"function"!=typeof i.onRedir?window.location=i.redirUrl:i.onRedir(i)},i.redirAfter-i.warnAfter)}function f(b,c){clearTimeout(j.timer),"dialog"===b&&c?j.timeLeft=Math.floor((i.redirAfter-i.warnAfter)/1e3):"session"===b&&c&&(j.timeLeft=Math.floor(i.redirAfter/1e3)),i.countdownBar&&"dialog"===b?j.percentLeft=Math.floor(j.timeLeft/((i.redirAfter-i.warnAfter)/1e3)*100):i.countdownBar&&"session"===b&&(j.percentLeft=Math.floor(j.timeLeft/(i.redirAfter/1e3)*100));var d=a(".countdown-holder"),e=j.timeLeft>=0?j.timeLeft:0;if(i.countdownSmart){var g=Math.floor(e/60),h=e%60,k=g>0?g+"m":"";k.length>0&&(k+=" "),k+=h+"s",d.text(k)}else d.text(e+"s");i.countdownBar&&a(".countdown-bar").css("width",j.percentLeft+"%"),j.timeLeft=j.timeLeft-1,j.timer=setTimeout(function(){f(b)},1e3)}var g,h={title:"Your Session is About to Expire!",message:"Your session is about to expire.",logoutButton:"Logout",keepAliveButton:"Stay Connected",keepAliveUrl:"/keep-alive",ajaxType:"POST",ajaxData:"",redirUrl:"/timed-out",logoutUrl:"/log-out",warnAfter:9e5,redirAfter:12e5,keepAliveInterval:5e3,keepAlive:!0,ignoreUserActivity:!1,onStart:!1,onWarn:!1,onRedir:!1,countdownMessage:!1,countdownBar:!1,countdownSmart:!1},i=h,j={};if(b&&(i=a.extend(h,b)),i.warnAfter>=i.redirAfter)return console.error('Bootstrap-session-timeout plugin is miss-configured. Option "redirAfter" must be equal or greater than "warnAfter".'),!1;if("function"!=typeof i.onWarn){var k=i.countdownMessage?"<p>"+i.countdownMessage.replace(/{timer}/g,'<span class="countdown-holder"></span>')+"</p>":"",l=i.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>                   </div>                 </div>':"";a("body").append('<div class="modal fade" id="session-timeout-dialog">               <div class="modal-dialog">                 <div class="modal-content">                   <div class="modal-header">                     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>                     <h4 class="modal-title">'+i.title+'</h4>                   </div>                   <div class="modal-body">                     <p>'+i.message+"</p>                     "+k+"                     "+l+'                   </div>                   <div class="modal-footer">                     <button id="session-timeout-dialog-logout" type="button" class="btn btn-default">'+i.logoutButton+'</button>                     <button id="session-timeout-dialog-keepalive" type="button" class="btn btn-primary" data-dismiss="modal">'+i.keepAliveButton+"</button>                   </div>                 </div>               </div>              </div>"),a("#session-timeout-dialog-logout").on("click",function(){window.location=i.logoutUrl}),a("#session-timeout-dialog").on("hide.bs.modal",function(){d()})}if(!i.ignoreUserActivity){var m=[-1,-1];a(document).on("keyup mouseup mousemove touchend touchmove",function(b){if("mousemove"===b.type){if(b.clientX===m[0]&&b.clientY===m[1])return;m[0]=b.clientX,m[1]=b.clientY}d(),a("#session-timeout-dialog").length>0&&a("#session-timeout-dialog").data("bs.modal")&&a("#session-timeout-dialog").data("bs.modal").isShown&&(a("#session-timeout-dialog").modal("hide"),a("body").removeClass("modal-open"),a("div.modal-backdrop").remove())})}var n=!1;d()}}(jQuery);
\ No newline at end of file
+(function(t){"use strict";t.sessionTimeout=function(e){function o(){p||(t.ajax({type:l.ajaxType,url:l.keepAliveUrl,data:l.ajaxData}),p=!0,setTimeout(function(){p=!1},l.keepAliveInterval))}function i(){clearTimeout(s),(l.countdownMessage||l.countdownBar)&&a("session",!0),"function"==typeof l.onStart&&l.onStart(l),l.keepAlive&&o(),s=setTimeout(function(){"function"!=typeof l.onWarn?t("#session-timeout-dialog").modal("show"):l.onWarn(l),n()},l.warnAfter)}function n(){clearTimeout(s),t("#session-timeout-dialog").hasClass("in")||!l.countdownMessage&&!l.countdownBar||a("dialog",!0),s=setTimeout(function(){"function"!=typeof l.onRedir?window.location=l.redirUrl:l.onRedir(l)},l.redirAfter-l.warnAfter)}function a(e,o){clearTimeout(d.timer),"dialog"===e&&o?d.timeLeft=Math.floor((l.redirAfter-l.warnAfter)/1e3):"session"===e&&o&&(d.timeLeft=Math.floor(l.redirAfter/1e3)),l.countdownBar&&"dialog"===e?d.percentLeft=Math.floor(d.timeLeft/((l.redirAfter-l.warnAfter)/1e3)*100):l.countdownBar&&"session"===e&&(d.percentLeft=Math.floor(d.timeLeft/(l.redirAfter/1e3)*100));var i=t(".countdown-holder"),n=d.timeLeft>=0?d.timeLeft:0;if(l.countdownSmart){var s=Math.floor(n/60),r=n%60,u=s>0?s+"m":"";u.length>0&&(u+=" "),u+=r+"s",i.text(u)}else i.text(n+"s");l.countdownBar&&t(".countdown-bar").css("width",d.percentLeft+"%"),d.timeLeft=d.timeLeft-1,d.timer=setTimeout(function(){a(e)},1e3)}var s,r={title:"Your Session is About to Expire!",message:"Your session is about to expire.",logoutButton:"Logout",logoutButtonCallback:!1,keepAliveButton:"Stay Connected",keepAliveButtonCallback:!1,keepAliveUrl:"/keep-alive",ajaxType:"POST",ajaxData:"",redirUrl:"/timed-out",logoutUrl:"/log-out",warnAfter:9e5,redirAfter:12e5,keepAliveInterval:5e3,keepAlive:!0,ignoreUserActivity:!1,onStart:!1,onWarn:!1,onRedir:!1,countdownMessage:!1,countdownBar:!1,countdownSmart:!1,activityHidesModal:!0,resetTimerWhileModalOpen:!0,isModalStatic:!1},l=r,d={};if(e&&(l=t.extend(r,e)),l.warnAfter>=l.redirAfter)return console.error('Bootstrap-session-timeout plugin is miss-configured. Option "redirAfter" must be equal or greater than "warnAfter".'),!1;if("function"!=typeof l.onWarn){var u=l.countdownMessage?"<p>"+l.countdownMessage.replace(/{timer}/g,'<span class="countdown-holder"></span>')+"</p>":"",c=l.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>                   </div>                 </div>':"",m=l.isModalStatic?'data-backdrop="static" data-keyboard="false"':"";t("body").append('<div class="modal fade" id="session-timeout-dialog" '+m+'>               <div class="modal-dialog">                 <div class="modal-content">                   <div class="modal-header">                     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>                     <h4 class="modal-title">'+l.title+'</h4>                   </div>                   <div class="modal-body">                     <p>'+l.message+"</p>                     "+u+"                     "+c+'                   </div>                   <div class="modal-footer">                     <button id="session-timeout-dialog-logout" type="button" class="btn btn-default">'+l.logoutButton+'</button>                     <button id="session-timeout-dialog-keepalive" type="button" class="btn btn-primary" data-dismiss="modal">'+l.keepAliveButton+"</button>                   </div>                 </div>               </div>              </div>"),"function"!=typeof l.logoutButtonCallback?t("#session-timeout-dialog-logout").on("click",function(){window.location=l.logoutUrl}):t("#session-timeout-dialog-logout").on("click",function(){l.logoutButtonCallback()}),"function"!=typeof l.keepAliveButtonCallback?t("#session-timeout-dialog").on("hide.bs.modal",function(){i()}):t("#session-timeout-dialog").on("hide.bs.modal",function(){l.keepAliveButtonCallback(),i()})}if(!l.ignoreUserActivity){var f=[-1,-1];t(document).on("keyup mouseup mousemove touchend touchmove",function(e){if("mousemove"===e.type){if(e.clientX===f[0]&&e.clientY===f[1])return;f[0]=e.clientX,f[1]=e.clientY}var o=t("#session-timeout-dialog").length>0&&t("#session-timeout-dialog").data("bs.modal")&&t("#session-timeout-dialog").data("bs.modal").isShown;(!o||o&&l.resetTimerWhileModalOpen)&&i(),!0===l.activityHidesModal&&o&&(t("#session-timeout-dialog").modal("hide"),t("body").removeClass("modal-open"),t("div.modal-backdrop").remove())})}var p=!1;i()}})(jQuery);

From 20323fb520143d88f2b6162f7421a5a686e9cecb Mon Sep 17 00:00:00 2001
From: Zach Kirkland <zkirkland@users.noreply.github.com>
Date: Thu, 21 Mar 2019 15:59:45 -0500
Subject: [PATCH 3/5] Update README.md with new option definitions.

---
 README.md | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/README.md b/README.md
index 9ffc25a..838e3c0 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,14 @@ Default: `'Logout'`
 
 This is the text shown to user via Bootstrap warning dialog after warning period in the logout button.
 
+**logoutButtonCallback**<br>
+
+Type: `function`
+
+Default: `false`
+
+This is a way to set a custom callback behavior for the logout button.
+
 **keepAliveButton**<br>
 
 Type: `String`
@@ -56,6 +64,14 @@ Default: `'Stay Connected'`
 
 This is the text shown to user via Bootstrap warning dialog after warning period in the Keep Alive button.
 
+**keepAliveButtonCallback**<br>
+
+Type: `function`
+
+Default: `false`
+
+This is a way to set a custom callback behavior for the keep alive button.
+
 **keepAliveUrl**
 
 Type: `String`
@@ -188,6 +204,31 @@ Default: `false`
 
 Custom callback you can use instead of redirecting the user to `redirUrl`. Takes options object as the only argument.
 
+**activityHidesModal**
+
+Type: `Boolean`
+
+Default: `true`
+
+If `false`, the modal persists on the screen regardless of mouse or keyboard activity.
+
+**resetTimerWhileModalOpen**
+
+Type: `Boolean`
+
+Default: `true`
+
+If `false`, the timer is not reset on any mouse or keyboard activity.
+
+**isModalStatic**
+
+Type: `Boolean`
+
+Default: `false`
+
+If `true`, the modal persists on the screen even when user clicks outside of the modal element or presses the escape key.
+To dismiss the modal the user must use the buttons.
+
 ## Examples
 
 You can play around with the examples in the `/examples` directory.

From fa8fb1d8c725d8996957f82f1e919033fa652827 Mon Sep 17 00:00:00 2001
From: Zach Kirkland <zkirkland@users.noreply.github.com>
Date: Thu, 21 Mar 2019 16:01:03 -0500
Subject: [PATCH 4/5] Update callback option types in README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 838e3c0..cc426e7 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ This is the text shown to user via Bootstrap warning dialog after warning period
 
 **logoutButtonCallback**<br>
 
-Type: `function`
+Type: `Boolean` or `function`
 
 Default: `false`
 
@@ -66,7 +66,7 @@ This is the text shown to user via Bootstrap warning dialog after warning period
 
 **keepAliveButtonCallback**<br>
 
-Type: `function`
+Type: `Boolean` or `function`
 
 Default: `false`
 

From bba92a49889e1971694d4b6247a271ce28286dc6 Mon Sep 17 00:00:00 2001
From: Zach Kirkland <zkirkland@users.noreply.github.com>
Date: Thu, 21 Mar 2019 16:07:34 -0500
Subject: [PATCH 5/5] add comments for edits

---
 dist/bootstrap-session-timeout.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dist/bootstrap-session-timeout.js b/dist/bootstrap-session-timeout.js
index 64bdfea..14d19d1 100644
--- a/dist/bootstrap-session-timeout.js
+++ b/dist/bootstrap-session-timeout.js
@@ -14,8 +14,10 @@
             title: 'Your Session is About to Expire!',
             message: 'Your session is about to expire.',
             logoutButton: 'Logout',
+            // allow control of logoutButton callback
             logoutButtonCallback: false,
             keepAliveButton: 'Stay Connected',
+            // allow control of keepAliveButton callback
             keepAliveButtonCallback: false,
             keepAliveUrl: '/keep-alive',
             ajaxType: 'POST',
@@ -33,8 +35,11 @@
             countdownMessage: false,
             countdownBar: false,
             countdownSmart: false,
+            // allow control over show/hide modal on mouse or keyboard activity
             activityHidesModal: true,
+            // allow control over timer reset while modal is shown
             resetTimerWhileModalOpen: true,
+            // allow ability to set modal as static.
             isModalStatic: false
         };
 
@@ -65,6 +70,7 @@
                   </div> \
                 </div>' : '';
 
+            // if isModalStatic is true, set modal data attributes to make the modal static
             var modalStaticAttributes = opt.isModalStatic ? 'data-backdrop="static" data-keyboard="false"' : '';
 
             // Create timeout warning dialog
@@ -89,6 +95,7 @@
              </div>');
 
             // "Logout" button click
+            // Allow for callback execution.
             if (typeof opt.logoutButtonCallback !== 'function') {
                 $('#session-timeout-dialog-logout').on('click', function () {
                     window.location = opt.logoutUrl;
@@ -100,6 +107,7 @@
             }
 
             // "Stay Connected" button click
+            // Allow for callback execution.
             if (typeof opt.keepAliveButtonCallback !== 'function') {
                 $('#session-timeout-dialog').on('hide.bs.modal', function () {
                     // Restart session timer
@@ -140,6 +148,7 @@
 
                 // If they moved the mouse not only reset the counter
                 // but remove the modal too!
+                // But only hide the modal if activityHidesModal is true.
                 if (opt.activityHidesModal === true && isModalOpen) {
                     // http://stackoverflow.com/questions/11519660/twitter-bootstrap-modal-backdrop-doesnt-disappear
                     $('#session-timeout-dialog').modal('hide');