Continue the march towards a brave new JSON_v1 world.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@7895 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/opac/extras/bbags.xml b/Open-ILS/web/opac/extras/bbags.xml
index 81d0a6a..e701f29 100644 (file)
--- a/Open-ILS/web/opac/extras/bbags.xml
+++ b/Open-ILS/web/opac/extras/bbags.xml
@@ -14,7 +14,7 @@
                <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
        
                <script language='javascript' src='/opac/common/js/slimtree.js'> </script>
-               <script language='javascript' src='/opac/common/js/JSON.js'> </script>
+               <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
                <script language='javascript' src='/opac/common/js/fmall.js'> </script>
                <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
                <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>

diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
index 79e22da..7c670e8 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
@@ -9,7 +9,7 @@
 
        <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/slimtree.js'> </script>
 
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/JSON.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/JSON_v1.js'> </script>
        <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmcore.js'> </script>
        <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmgen.js'> </script>
        <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/opac_utils.js'> </script>

diff --git a/Open-ILS/web/reports/oils_rpt_common.xhtml b/Open-ILS/web/reports/oils_rpt_common.xhtml
index c8dab07..570b8a9 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_common.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_common.xhtml
@@ -2,7 +2,7 @@
 <script language='javascript' src='/opac/common/js//config.js'> </script> 
 <script language='javascript' src='/opac/common/js/CGI.js'> </script>
 <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
-<script language='javascript' src='/opac/common/js/JSON.js'> </script>
+<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
 <script language='javascript' src='/opac/common/js/fmall.js'> </script>
 <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
 <script language='javascript' src='/opac/common/js/Cookies.js'> </script>

diff --git a/Open-ILS/web/reports/xul/template_builder.xul b/Open-ILS/web/reports/xul/template_builder.xul
index 434066e..b62a41a 100644 (file)
--- a/Open-ILS/web/reports/xul/template_builder.xul
+++ b/Open-ILS/web/reports/xul/template_builder.xul
@@ -8,7 +8,7 @@
 <script src='/opac/common/js/utils.js' type="application/x-javascript; e4x=1"/>
 <script src='/opac/common/js/config.js' type="application/x-javascript; e4x=1"/>
 <script src='/opac/common/js/CGI.js' type="application/x-javascript; e4x=1"/>
-<script src='/opac/common/js/JSON.js' type="application/x-javascript; e4x=1"/>
+<script src='/opac/common/js/JSON_v1.js' type="application/x-javascript; e4x=1"/>
 <script src='/opac/common/js/fmall.js' type="application/x-javascript; e4x=1"/>
 <script src='/opac/common/js/fmgen.js' type="application/x-javascript; e4x=1"/>
 <script src='/opac/common/js/Cookies.js' type="application/x-javascript; e4x=1"/>