From dca8f74f25a0996701dc987f282412152fa49d08 Mon Sep 17 00:00:00 2001 From: Danny Bessems Date: Wed, 19 Jun 2019 10:55:01 +0000 Subject: [PATCH] Minor edits (housekeeping) --- include/lucidAuth.template.php | 17 ----------------- public/misc/script.index.js | 13 +++++-------- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/include/lucidAuth.template.php b/include/lucidAuth.template.php index b823a3b..a4146eb 100644 --- a/include/lucidAuth.template.php +++ b/include/lucidAuth.template.php @@ -72,23 +72,6 @@ $pageLayout['full_alt'] = <<<'FULL_ALT' FULL_ALT; -$pageLayout['frames'] = <<<'FRAMES' - - - - - lucidAuth - - - - - - - %2$s - - -FRAMES; - $contentLayout['login'] = <<<'LOGIN'
diff --git a/public/misc/script.index.js b/public/misc/script.index.js index 5f555d7..1fd11cc 100644 --- a/public/misc/script.index.js +++ b/public/misc/script.index.js @@ -31,12 +31,6 @@ $(document).ready(function(){ 'color': '#FFF' }); if (data.CrossDomainLogin) { -console.log('CrossDomainLogin initiated'); -// do ajax in parallel, show progress, -// redirect once all finished loading or timeout after $X ms -// origin domain should be exempted from timeout -// (because origin domain can/will be different from current domain --due to traefik design). - var cookieDomains = JSON.parse(data.CookieDomains); var XHR = []; cookieDomains.forEach(function(domain) { @@ -55,12 +49,15 @@ console.log('CrossDomainLogin initiated'); })); }); $.when.apply($, XHR).then(function(){ - $.each(arguments, function(_index, arg) { - console.log(JSON.stringify(arg)); + $.each(arguments, function(_index, _arg) { + // Show progress somehow (maybe something like https://minicss.org/v2/progress) }); }); } // Finished (either succesfully or through timeout) cross-domain logins +// redirect once all finished loading or timeout after $X ms +// origin domain should be exempted from timeout +// (because origin domain can/will be different from current domain --due to traefik design). //window.location.replace(data.Location); }, 2250); } else {