Bug 20568: Fix bad resolution conflict with bug 18403

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / includes / js_includes.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
index 326f22a..de81f3f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
@@ -1,3 +1,4 @@
+[% USE Asset %]
 [% USE AudioAlerts %]
 [%# Prevent XFS attacks -%]
 [% UNLESS popup %]
@@ -11,19 +12,19 @@
     </script>
 [% END %]
 
-<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min.js"></script>
-<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script>
-<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.js"></script>
-<script type="text/javascript" src="[% interface %]/lib/shortcut/shortcut.js"></script>
-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min.js"></script>
-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.highlight-3.js"></script>
-<script type="text/javascript" src="[% interface %]/lib/bootstrap/bootstrap.min.js"></script>
-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.validate.min.js"></script>
+[% Asset.js("lib/jquery/jquery-2.2.3.min.js") %]
+[% Asset.js("lib/jquery/jquery-migrate-1.3.0.min.js") %]
+[% Asset.js("lib/jquery/jquery-ui-1.11.4.min.js") %]
+[% Asset.js("lib/shortcut/shortcut.js") %]
+[% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") %]
+[% Asset.js("lib/jquery/plugins/jquery.highlight-3.js") %]
+[% Asset.js("lib/bootstrap/bootstrap.min.js") %]
+[% Asset.js("lib/jquery/plugins/jquery.validate.min.js") %]
 <!-- koha core js -->
-<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global.js"></script>
+[% Asset.js("js/staff-global.js") %]
+[% Asset.js("js/commons.js") %]
 
 [% INCLUDE 'validator-strings.inc' %]
-[% PROCESS 'html_helpers.inc' %]
 [% IF ( IntranetUserJS ) %]
     <script type="text/javascript">
     //<![CDATA[
@@ -52,11 +53,11 @@
     //]]>
     </script>
 
-    <script type="text/javascript" src="[% interface %]/[% theme %]/js/basket.js"></script>
+    [% Asset.js("js/basket.js") %]
 [% END %]
 
 [% IF LocalCoverImages %]
-    <script type="text/javascript" src="[% interface %]/[% theme %]/js/localcovers.js"></script>
+    [% Asset.js("js/localcovers.js") %]
     <script type="text/javascript">
         //<![CDATA[
             var NO_LOCAL_JACKET = _("No cover image available");
@@ -89,7 +90,7 @@
     [% IF ( CircAutocompl ) %]
         <script type="text/javascript">
             $(document).ready(function(){
-                $( "#findborrower" ).autocomplete({
+                var obj = $( "#findborrower" ).autocomplete({
                     source: "/cgi-bin/koha/circ/ysearch.pl",
                     minLength: 3,
                     select: function( event, ui ) {
@@ -97,13 +98,15 @@
                         $("#patronsearch").submit();
                         return false;
                     }
-                })
-                .data( "ui-autocomplete" )._renderItem = function( ul, item ) {
-                    return $( "<li></li>" )
-                    .data( "ui-autocomplete-item", item )
-                    .append( "<a>" + item.surname + ", " + item.firstname + " (" + item.cardnumber + ") <small>" + item.dateofbirth + " " + item.address + " " + item.city + " " + item.zipcode + " " + item.country + "</small></a>" )
-                    .appendTo( ul );
-                };
+                }).data( "ui-autocomplete" );
+                if( obj ) {
+                    obj._renderItem = function( ul, item ) {
+                        return $( "<li></li>" )
+                        .data( "ui-autocomplete-item", item )
+                        .append( "<a>" + item.surname + ", " + item.firstname + " (" + item.cardnumber + ") <small>" + item.dateofbirth + " " + item.address + " " + item.city + " " + item.zipcode + " " + item.country + "</small></a>" )
+                        .appendTo( ul );
+                    };
+                }
             });
         </script>
     [% END %]