djpbessems/lucidAuth
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Periodic merge upstream #5

Manually merged
djpbessems merged 13 commits from development into master 2019-12-30 12:18:50 +00:00
Conversation 0 Commits 13 Files Changed 16 +5 -3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c94b736062 - Show all commits

8
public/misc/script.index.js
View File

@@ -49,15 +49,17 @@ $(document).ready(function(){
token: data.SecureToken token: data.SecureToken
})) }))
} }
}).done(function() { }).done(function(data, textStatus) {
NProgress.inc(1 / XHR.length); NProgress.inc(1 / XHR.length);
}).fail(function() { console.log('CrossDomain login step [' + data + ':' + textStatus + ']');
}).fail(function(_jqXHR, textStatus, errorThrown) {
console.log('CrossDomain login failed for at least one domain [' + textStatus + ':' + errorThrown + ']');
// Should check why this failed (timeout or bad request?), and if this is the origin domain, take action // Should check why this failed (timeout or bad request?), and if this is the origin domain, take action
})); }));
}); });
$.when.apply($, XHR).then(function(){ $.when.apply($, XHR).then(function(){
$.each(arguments, function(_index, _arg) { $.each(arguments, function(_index, _arg) {
// Finished cross-domain logins (either succesfully or through timeout) // Finished cross-domain logins (either successfully or through timeout)
NProgress.done(); NProgress.done();
window.location.replace(data.Location); window.location.replace(data.Location);
}); });