Isolate success messages from the html in lightbox first before trying to...

Isolate success messages from the html in lightbox first before trying to deframe it for success messages to work even if the isolation would not be successful.

Isolate success messages from the html in lightbox first before trying to...
Isolate success messages from the html in lightbox first before trying to deframe it for success messages to work even if the isolation would not be successful.
c8cb659f · Ere Maijala · 65f09b68 · c8cb659f
Commit c8cb659f authored 9 years ago by Ere Maijala
--- a/themes/bootstrap3/js/lightbox.js
+++ b/themes/bootstrap3/js/lightbox.js
@@ -29,17 +29,17 @@ VuFind.lightbox = (function() {
  // Update content
  var _update = function(html) {
    if (!html.match) return;
-    // Deframe HTML
-    if(html.match('<!DOCTYPE html>')) {
-      html = $('<div>'+html+'</div>').find('.main > .container').html();
-    }
    // Isolate successes
-    var testDiv = $('<div>'+html+'</div>');
-    var alerts = testDiv.find('.alert-success');
+    var htmlDiv = $('<div>'+html+'</div>');
+    var alerts = htmlDiv.find('.alert-success');
    if (alerts.length > 0) {
      showAlert(alerts[0].innerHTML, 'success');
      return;
    }
+    // Deframe HTML
+    if(html.match('<!DOCTYPE html>')) {
+      html = htmlDiv.find('.main > .container').html();
+    }
    // Fill HTML
    _html(html);
    _modal.modal('show');