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 +6 -3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e520108237 - Show all commits

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

@ -49,16 +49,19 @@ $(document).ready(function(){
token: data.SecureToken token: data.SecureToken
})) }))
} }
}).done(function() { }).done(function(_data, _textStatus, jqXHR) {
NProgress.inc(1 / XHR.length); NProgress.inc(1 / XHR.length);
}).fail(function() { console.log('CrossDomain login succeeded for domain `' + domain + '` [' + JSON.stringify(jqXHR) + ']');
}).fail(function(jqXHR) {
console.log('CrossDomain login failed for domain `' + domain + '` [' + JSON.stringify(jqXHR) + ')]');
// 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();
console.log('CrossDomain login completed; forwarding to `' + data.Location + '`');
window.location.replace(data.Location); window.location.replace(data.Location);
}); });
}); });