From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 25 Mar 2015 15:58:09 +0000 (-0400)
Subject: JBAS-500 Additional JS cleanup for 2.5 staff client
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c4e5d9a7fd49be01faf90b1f3ce6de9e0097bad8;p=working%2FEvergreen.git

JBAS-500 Additional JS cleanup for 2.5 staff client

Loading JSAN from within the TPAC templates more than once was causing
the staff client to lock up.  Plus, there's no reason to load it more
than once.  Kill that and a few other duplicate imports.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/KCLS/openils/var/templates_kcls/opac/browse_items.tt2 b/KCLS/openils/var/templates_kcls/opac/browse_items.tt2
index 5d1ebaf991..8d2abc28dd 100644
--- a/KCLS/openils/var/templates_kcls/opac/browse_items.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/browse_items.tt2
@@ -15,9 +15,6 @@
     page_count = ctx.page_size == 0 ? 1 : POSIX.ceil(ctx.hit_count / ctx.page_size);
 %]
     <script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
-    <script type="text/javascript" src="[% ctx.media_prefix %]/js/dojo/dojo/openils_dojo.js"></script>
-    <script type="text/javascript" src="[% ctx.media_prefix %]/js/dojo/opensrf/md5.js"></script>
-    <script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
     <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/limit_available.js"></script>
     <div id="search-header">
         <div id="search-wrapper">
diff --git a/KCLS/openils/var/templates_kcls/opac/browse_results.tt2 b/KCLS/openils/var/templates_kcls/opac/browse_results.tt2
index d87c7d028e..650d10abf1 100644
--- a/KCLS/openils/var/templates_kcls/opac/browse_results.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/browse_results.tt2
@@ -58,7 +58,6 @@
 
 [% END %]
 
-<script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
 
     <div id="search-wrapper">
         [% INCLUDE "opac/parts/searchbar_browse.tt2" %]
diff --git a/KCLS/openils/var/templates_kcls/opac/parts/advanced/search.tt2 b/KCLS/openils/var/templates_kcls/opac/parts/advanced/search.tt2
index 17ae8188ad..bdd50973d1 100644
--- a/KCLS/openils/var/templates_kcls/opac/parts/advanced/search.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/parts/advanced/search.tt2
@@ -141,11 +141,6 @@
 </form>
 
 [% IF ctx.is_staff && search.allow_templates == 'true' %]
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/staff.js"></script>
-<script type="text/javascript" src="/xul/server/OpenILS/global_util.js"></script>
-<script type="text/javascript" src="/js/ui/default/opac/simple.js"></script>
-<script type="text/javascript" src="/xul/server/main/constants.js"></script>
-<script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
 <script type="text/javascript" src="/js/ui/kcls/conify/global/config/search_templates.js"></script>
 <script type="text/javascript">
     var pubdateSel = $("adv_global_pub_date_type");
@@ -165,4 +160,4 @@
         populateSearchOptions(template);
     }
 </script>
-[% END %]
\ No newline at end of file
+[% END %]
diff --git a/KCLS/openils/var/templates_kcls/opac/parts/searchbar_browse.tt2 b/KCLS/openils/var/templates_kcls/opac/parts/searchbar_browse.tt2
index 1a5ad06320..d9c6ec8c6a 100644
--- a/KCLS/openils/var/templates_kcls/opac/parts/searchbar_browse.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/parts/searchbar_browse.tt2
@@ -2,10 +2,6 @@
     sort = CGI.param('sort') || "pubdate.descending";
      %]
     <script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
-    <script type="text/javascript" src="[% ctx.media_prefix %]/js/dojo/dojo/openils_dojo.js"></script>
-    <script type="text/javascript" src="[% ctx.media_prefix %]/js/dojo/opensrf/md5.js"></script>
-    <script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
-    
 	
     <div id="search-box">
         <span class="search_catalog_lbl">