From 53e8912c69c69a110aa71b228b4f705154b97652 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Fri, 21 Feb 2014 12:22:11 -0500
Subject: [PATCH] Holds error handling 2: The Fixening. Bootstrap.
---
themes/bootstrap/js/lightbox.js | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/themes/bootstrap/js/lightbox.js b/themes/bootstrap/js/lightbox.js
index 3747711a78a..e373ca25322 100644
--- a/themes/bootstrap/js/lightbox.js
+++ b/themes/bootstrap/js/lightbox.js
@@ -450,10 +450,10 @@ $(document).ready(function() {
url:lastLightboxURL,
data:data,
success:function(html) { // Success!
- var fi = html.indexOf('<div class="alert alert-error">')+31;
+ var fi = html.indexOf('<div class="alert alert-error">');
if(fi > -1) {
- var li = html.indexOf('</div>', fi);
- displayLightboxError(html.substring(fi, li));
+ var li = html.indexOf('</div>', fi+31);
+ displayLightboxError(html.substring(fi+31, li));
} else {
document.location.href = path+'/MyResearch/Holds';
}
@@ -509,7 +509,15 @@ $(document).ready(function() {
$('.placehold').click(function() {
var params = deparam($(this).attr('href'));
params.hashKey = params.hashKey.split('#')[0]; // Remove #tabnav
- return getLightbox('Record', 'Hold', params, {});
+ return getLightbox('Record', 'Hold', params, {}, function(html) {
+ var fi = html.indexOf('<div class="alert alert-error">');
+ if(fi > -1) {
+ var li = html.indexOf('</div>', fi+31);
+ changeModalContent(html.substring(fi, li));
+ } else {
+ changeModalContent(html);
+ }
+ });
});
// Save record links
$('.save-record').click(function() {
--
GitLab