From c8cb659f49b887d276fe15dd1a11b32685c434c7 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Wed, 9 Mar 2016 09:47:07 +0200
Subject: [PATCH] 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.
---
themes/bootstrap3/js/lightbox.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/themes/bootstrap3/js/lightbox.js b/themes/bootstrap3/js/lightbox.js
index f2ee7377eed..323b546cb06 100644
--- 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');
--
GitLab