Compare commits
2 Commits
c94b736062
...
2f1beb47c7
Author | SHA1 | Date | |
---|---|---|---|
2f1beb47c7 | |||
e520108237 |
@ -49,11 +49,19 @@ $(document).ready(function(){
|
|||||||
token: data.SecureToken
|
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) {
|
}).done(function(data, textStatus) {
|
||||||
NProgress.inc(1 / XHR.length);
|
NProgress.inc(1 / XHR.length);
|
||||||
console.log('CrossDomain login step [' + data + ':' + textStatus + ']');
|
console.log('CrossDomain login step [' + data + ':' + textStatus + ']');
|
||||||
}).fail(function(_jqXHR, textStatus, errorThrown) {
|
}).fail(function(_jqXHR, textStatus, errorThrown) {
|
||||||
console.log('CrossDomain login failed for at least one domain [' + 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
|
||||||
}));
|
}));
|
||||||
});
|
});
|
||||||
@ -61,6 +69,7 @@ $(document).ready(function(){
|
|||||||
$.each(arguments, function(_index, _arg) {
|
$.each(arguments, function(_index, _arg) {
|
||||||
// Finished cross-domain logins (either successfully 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);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
Reference in New Issue
Block a user