Skip to content
Snippets Groups Projects
Commit 8e12a61e authored by Ere Maijala's avatar Ere Maijala Committed by Chris Hallberg
Browse files

Emit VuFind.lightbox.login event even if processing is short-circuited (#1175)

parent 4381d464
No related merge requests found
......@@ -136,20 +136,19 @@ VuFind.register('lightbox', function Lightbox() {
_xhr = $.ajax(obj);
_xhr.always(function lbAjaxAlways() { _xhr = false; })
.done(function lbAjaxDone(content, status, jq_xhr) {
if (jq_xhr.status === 205) {
VuFind.refreshPage();
return;
}
var testDiv = $('<div/>').html(content);
var errorMsgs = testDiv.find('.flash-message.alert-danger:not([data-lightbox-ignore])');
// Place Hold error isolation
if (obj.url.match(/\/Record\/.*(Hold|Request)\?/)) {
if (errorMsgs.length && testDiv.find('.record').length) {
var msgs = errorMsgs.toArray().map(function getAlertHtml(el) {
return el.innerHTML;
}).join('<br/>');
showAlert(msgs, 'danger');
return false;
var errorMsgs = [];
if (jq_xhr.status !== 205) {
var testDiv = $('<div/>').html(content);
errorMsgs = testDiv.find('.flash-message.alert-danger:not([data-lightbox-ignore])');
// Place Hold error isolation
if (obj.url.match(/\/Record\/.*(Hold|Request)\?/)) {
if (errorMsgs.length && testDiv.find('.record').length) {
var msgs = errorMsgs.toArray().map(function getAlertHtml(el) {
return el.innerHTML;
}).join('<br/>');
showAlert(msgs, 'danger');
return false;
}
}
}
if ( // Close the lightbox after deliberate login
......@@ -173,6 +172,10 @@ VuFind.register('lightbox', function Lightbox() {
}
_currentUrl = _originalUrl; // Now that we're logged in, where were we?
}
if (jq_xhr.status === 205) {
VuFind.refreshPage();
return;
}
render(content);
})
.fail(function lbAjaxFail(deferred, errorType, msg) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment