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

Resolved mergeconflict

This commit is contained in:
Danny Bessems 2019-12-06 12:56:31 +00:00
parent e520108237 c94b736062
commit 2f1beb47c7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,11 +49,19 @@ $(document).ready(function(){
token: data.SecureToken
}))
}
<<<<<<< HEAD
}).done(function(_data, _textStatus, jqXHR) {
NProgress.inc(1 / XHR.length);
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) + ')]');
=======
}).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
}));
});