diff --git a/themes/bootstrap/js/core/bootstrap.js b/themes/bootstrap/js/core/bootstrap.js index 1b90b973d4db0ff9e0f57384d4913a4f6afabf22..4225b73a06e6a2de7222f352074b74b5cfd95135 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 1c40b3e0feabb5d5118c35530238e3f4e90cc04b..7728e6289681f440b79bad2227b691c8b8961149 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 50e7b491fdf39f9ee729ed24971ef6e054fe86d2..053cdae9824e2016877cf878f15857c465202b86 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