Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed time reset when dialog is open #12

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed time reset when dialog is open #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31d272a
Fixed timer reset when dialog is open
diakonos Mar 10, 2015
13431b7
fixed indentation
diakonos Mar 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions dist/bootstrap-session-timeout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,10 @@
// Reset timer on any of these events
if (!opt.ignoreUserActivity) {
$(document).on('keyup mouseup mousemove touchend touchmove', function() {
startSessionTimer();
if(!$('#session-timeout-dialog').hasClass('in')) {
// If warning dialog is not already open start session timer
startSessionTimer();
}
});
}

Expand Down Expand Up @@ -149,9 +152,8 @@
function startDialogTimer() {
// Clear session timer
clearTimeout(timer);
if (!$('#session-timeout-dialog').hasClass('in') && (opt.countdownMessage || opt.countdownBar)) {
// If warning dialog is not already open and either opt.countdownMessage
// or opt.countdownBar are set start countdown
if ((opt.countdownMessage || opt.countdownBar)) {
// If either opt.countdownMessage or opt.countdownBar are set start countdown
startCountdownTimer('dialog', true);
}
// Set dialog timer
Expand Down