diff --git a/themes/bootstrap3/js/lightbox.js b/themes/bootstrap3/js/lightbox.js index 01eade748b90dc56286d101fcfc54591786d53d2..a063b48f4b068f97b1ddb9af75154c90567e479d 100644 --- a/themes/bootstrap3/js/lightbox.js +++ b/themes/bootstrap3/js/lightbox.js @@ -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) {