diff --git a/app/assets/javascripts/casino/sessions.js b/app/assets/javascripts/casino/sessions.js index bcee5e5e..5843c23f 100644 --- a/app/assets/javascripts/casino/sessions.js +++ b/app/assets/javascripts/casino/sessions.js @@ -1,4 +1,5 @@ (function(win, doc) { + var timeoutAutoLogin; var url = win.CASino.url('login'), cookie_regex = /(^|;)\s*tgt=/, ready_bound = false; @@ -13,18 +14,23 @@ } win.location = url; } else { - setTimeout(checkCookieExists, 1000); + timeoutAutoLogin = setTimeout(checkCookieExists, 1000); } } // Auto-login when logged-in in other browser window (9887c4e) + // @lchanouha fix, 08/2016: whe should'nt be redirected while loggin in doc.addEventListener('DOMContentLoaded', function() { if(ready_bound) { return; } ready_bound = true; - if(doc.getElementById('login-form')) { + var loginFrom = doc.getElementById('login-form') + if(loginFrom) { checkCookieExists(); + loginFrom.addEventListener("submit", function(){ + clearTimeout(timeoutAutoLogin); + }); } });