Attachment 32297 Details for Bug 13052 – Bug 13052 - OPAC Cart JavaScript is included twice in the footer

[patch] Bug 13052 - OPAC Cart JavaScript is included twice in the footer

Bug-13052---OPAC-Cart-JavaScript-is-included-twice.patch (text/plain), 2.47 KB, created by Chris Cormack on 2014-10-14 12:50:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2014-10-14 12:50:15 UTC

Size: 2.47 KB

patch

obsolete

>From 2f2bb436a597d5869ab75c727c16a30f035a1994 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 9 Oct 2014 09:40:26 -0400
>Subject: [PATCH] Bug 13052 - OPAC Cart JavaScript is included twice in the
> footer
>
>The external JavaScript file which powers the OPAC Cart should not be
>included twice. The correct instance is the one which comes after the
>definition of MSG strings.
>
>To test you must have the opacbookbag system preference turned on. In
>Bootstrap OPAC, test adding some items to the Cart and confirm that Cart
>operations work correctly.
>
>Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
>---
> koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
>index 4128061..596341a 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
>@@ -103,11 +103,6 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
> <script type="text/javascript" src="[% interface %]/[% theme %]/js/amazonimages.js"></script>
> [% END %]
> 
>-[% IF Koha.Preference( 'opacbookbag' ) == 1 %]<script type="text/javascript" src="[% interface %]/[% theme %]/js/basket.js">
>-[% ELSIF ( Koha.Preference( 'virtualshelves' ) == 1 ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/js/basket.js">
>-[% ELSE %]<script type="text/javascript"> var readCookie;[% END %]
>-</script>
>-
> <script type="text/javascript">
>     //<![CDATA[
>     var MSG_CONFIRM_AGAIN = _("Warning: Cannot be undone. Please confirm once again")
>@@ -153,6 +148,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
>     [% IF ( opacuserjs ) %][% opacuserjs %][% END %]
>     //]]>
> </script>
>+
> [% IF Koha.Preference( 'opacbookbag' ) == 1 %]
>     <script type="text/javascript" src="[% interface %]/[% theme %]/js/basket.js"></script>
> [% ELSIF ( Koha.Preference( 'virtualshelves' ) == 1 ) %]
>@@ -160,6 +156,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
> [% ELSE %]
>     <script type="text/javascript">var readCookie;</script>
> [% END %]
>+
> [% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %]<script type="text/javascript" src="[% interface %]/[% theme %]/js/tags.js"></script>[% END %][% ELSE %][% END %]
> [% IF ( GoogleJackets ) %]
>     <script type="text/javascript" src="[% interface %]/[% theme %]/js/google-jackets.js"></script>
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 13052: 32085 | 32297 | 32312