From 4e08f596803b912571b3e0c93de44be5f25ea04f Mon Sep 17 00:00:00 2001 From: Mark Friedrich Date: Thu, 7 Jun 2018 21:02:25 +0200 Subject: [PATCH] - fixed login bug with un accepted cookie hint, closed #633 --- js/app/login.js | 9 ++++++++- public/js/v1.3.5/app/login.js | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/js/app/login.js b/js/app/login.js index 186a498b..5bee651a 100644 --- a/js/app/login.js +++ b/js/app/login.js @@ -105,10 +105,17 @@ define([ let ssoButtonElement = $('.' + config.ssoButtonClass); let cookieHintElement = $('#' + config.cookieHintId); - $(document).on('click', '.' + config.ssoButtonClass + ', .' + config.characterSelectionClass + ' a', function(){ + $(document).on('click', '.' + config.characterSelectionClass + ' a', function(){ $('.' + config.splashOverlayClass).showSplashOverlay(); }); + $(document).on('click', '.' + config.ssoButtonClass , function(){ + if(Util.getCookie('cookie') === '1'){ + // ... cookies accepted no "confirm" shown + $('.' + config.splashOverlayClass).showSplashOverlay(); + } + }); + // cookie hint -------------------------------------------------------- cookieHintElement.find('.btn-success').on('click', function(){ setAcceptCookie(); diff --git a/public/js/v1.3.5/app/login.js b/public/js/v1.3.5/app/login.js index 186a498b..5bee651a 100644 --- a/public/js/v1.3.5/app/login.js +++ b/public/js/v1.3.5/app/login.js @@ -105,10 +105,17 @@ define([ let ssoButtonElement = $('.' + config.ssoButtonClass); let cookieHintElement = $('#' + config.cookieHintId); - $(document).on('click', '.' + config.ssoButtonClass + ', .' + config.characterSelectionClass + ' a', function(){ + $(document).on('click', '.' + config.characterSelectionClass + ' a', function(){ $('.' + config.splashOverlayClass).showSplashOverlay(); }); + $(document).on('click', '.' + config.ssoButtonClass , function(){ + if(Util.getCookie('cookie') === '1'){ + // ... cookies accepted no "confirm" shown + $('.' + config.splashOverlayClass).showSplashOverlay(); + } + }); + // cookie hint -------------------------------------------------------- cookieHintElement.find('.btn-success').on('click', function(){ setAcceptCookie();