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

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

@ -49,19 +49,11 @@ $(document).ready(function(){
token: data.SecureToken token: data.SecureToken
})) }))
} }
<<<<<<< HEAD
}).done(function(_data, _textStatus, jqXHR) { }).done(function(_data, _textStatus, jqXHR) {
NProgress.inc(1 / XHR.length); NProgress.inc(1 / XHR.length);
console.log('CrossDomain login succeeded for domain `' + domain + '` [' + JSON.stringify(jqXHR) + ']'); console.log('CrossDomain login succeeded for domain `' + domain + '` [' + JSON.stringify(jqXHR) + ']');
}).fail(function(jqXHR) { }).fail(function(jqXHR) {
console.log('CrossDomain login failed for domain `' + domain + '` [' + JSON.stringify(jqXHR) + ')]'); console.log('CrossDomain login failed for domain `' + domain + '` [' + JSON.stringify(jqXHR) + ')]');
=======
}).done(function(data, textStatus) {
NProgress.inc(1 / XHR.length);
console.log('CrossDomain login step [' + data + ':' + textStatus + ']');
}).fail(function(_jqXHR, textStatus, errorThrown) {
console.log('CrossDomain login failed for at least one domain [' + textStatus + ':' + errorThrown + ']');
>>>>>>> c94b73606231da5206372f69103173d56135a960
// 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
})); }));
}); });