From 2d9b1b958e5d71d9c737a9550fa9aa826e3801be Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Mon, 16 Sep 2013 15:01:07 -0400
Subject: [PATCH] VUFIND-891 and unnecessary lightbox param removal.
---
themes/bootstrap/js/core/bootstrap.js | 2 +-
themes/bootstrap/js/lightbox.js | 2 +-
themes/bootstrap/templates/cart/save.phtml | 7 ++++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/themes/bootstrap/js/core/bootstrap.js b/themes/bootstrap/js/core/bootstrap.js
index 1b90b973d4d..4225b73a06e 100644
--- a/themes/bootstrap/js/core/bootstrap.js
+++ b/themes/bootstrap/js/core/bootstrap.js
@@ -1294,7 +1294,7 @@
removeWithAnimation() :
$tip.detach()
- this.$element.trigger('hidden')
+ //this.$element.trigger('hidden')
return this
}
diff --git a/themes/bootstrap/js/lightbox.js b/themes/bootstrap/js/lightbox.js
index 1c40b3e0fea..7728e628968 100644
--- a/themes/bootstrap/js/lightbox.js
+++ b/themes/bootstrap/js/lightbox.js
@@ -283,7 +283,7 @@ function changeModalContent(html) {
registerModalForms($('#modal'));
}
// Close the lightbox and run update functions
-function closeLightbox(x) {
+function closeLightbox() {
if(modalXHR) modalXHR.abort();
lightboxShown = false;
$('#modal').modal('hide');
diff --git a/themes/bootstrap/templates/cart/save.phtml b/themes/bootstrap/templates/cart/save.phtml
index 50e7b491fdf..053cdae9824 100644
--- a/themes/bootstrap/templates/cart/save.phtml
+++ b/themes/bootstrap/templates/cart/save.phtml
@@ -61,13 +61,14 @@
</div>
</form>
-<? /* TODO: Prevent popover from closing modal
+<?
$items = $this->transEsc('items');
$script = <<<JS
var list = $('.item-list');
var items = list.find('li').length;
var bubble = list.html();
list.html('<span class="btn">'+items+' {$items}</span>');
- list.find('.btn').popover({html:true,title:bubble});
+ list.find('.btn').popover({html:true,content:bubble});
JS;
-echo $this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, $script, 'SET') */ ?>
\ No newline at end of file
+?>
+<?=$this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, $script, 'SET') ?>
\ No newline at end of file
--
GitLab