LP 1020665 upgrade djConfig vars to dojoConfig/data-dojo-config.

The user of djConfig for config was turned to data-dojo-config as attributes,
and dojoConfig in normal scripts as of dojo 1.6.

Signed-off-by: Joseph Lewis <joehms22@gmail.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm
index 1711b65..e1651dd 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm
@@ -217,7 +217,7 @@ sub show_processing_template {
         </style>
 
         <script type="text/javascript">
-            var djConfig= {
+            var dojoConfig= {
                 isDebug: false,
                 parseOnLoad: true,
                 AutoIDL: ['aou','aout','pgt','au','cbreb']
@@ -334,7 +334,7 @@ sub show_template {
         </style>
 
         <script type="text/javascript">
-            var djConfig= {
+            var dojoConfig= {
                 isDebug: false,
                 parseOnLoad: true,
                 AutoIDL: ['aou','aout','pgt','au','cbreb']

diff --git a/Open-ILS/src/templates/base.tt2 b/Open-ILS/src/templates/base.tt2
index a4238f4..939a3b7 100644 (file)
--- a/Open-ILS/src/templates/base.tt2
+++ b/Open-ILS/src/templates/base.tt2
@@ -6,7 +6,7 @@
         <link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/skin/[% ctx.skin %].css' />
         <link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/theme/[% ctx.skin %].css' />
            <script language='javascript' src='/IDL2js' type='text/javascript'></script>
-        <script type="text/javascript">var djConfig = {parseOnLoad:true,isDebug:false};</script>
+        <script type="text/javascript">var dojoConfig = {parseOnLoad:true,isDebug:false};</script>
         <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>

diff --git a/Open-ILS/src/templates/opac/parts/js.tt2 b/Open-ILS/src/templates/opac/parts/js.tt2
index 7029554..06f43a5 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/js.tt2
+++ b/Open-ILS/src/templates/opac/parts/js.tt2
@@ -41,7 +41,7 @@
 [%- END %]
 [%- IF want_dojo; -%]
 <script type="text/javascript">
-     var djConfig = {
+     var dojoConfig = {
          locale: "[% ctx.locale | lower | replace('_', '-') %]",
          parseOnLoad: true,
          isDebug: false

diff --git a/Open-ILS/src/templates/password-reset/request-form.tt2 b/Open-ILS/src/templates/password-reset/request-form.tt2
index c4b9ca6..b85cd4d 100644 (file)
--- a/Open-ILS/src/templates/password-reset/request-form.tt2
+++ b/Open-ILS/src/templates/password-reset/request-form.tt2
@@ -25,7 +25,7 @@
     <button name="submit" id="submitButton" type="submit" data-dojo-type="dijit.form.Button">[% i18n.BUTTON_SUBMIT %]</button>
   </form>
 </body>
-<script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+<script type="text/javascript" src="/js/dojo/dojo/dojo.js" data-dojo-config="parseOnLoad: true"></script>
 <script type="text/javascript">
   dojo.require("dijit.form.Button");
   dojo.require("dijit.form.ValidationTextBox");

diff --git a/Open-ILS/web/conify/global/admin.html b/Open-ILS/web/conify/global/admin.html
index 08bd492..8569e8e 100644 (file)
--- a/Open-ILS/web/conify/global/admin.html
+++ b/Open-ILS/web/conify/global/admin.html
@@ -42,7 +42,7 @@
         </style>
 
         <!-- Dojo goodness -->
-        <script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+        <script type="text/javascript" src="/js/dojo/dojo/dojo.js" data-dojo-config="parseOnLoad: true"></script>
         <script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
 
         <script type="text/javascript">

diff --git a/Open-ILS/web/conify/global/config/marc_code_maps.html b/Open-ILS/web/conify/global/config/marc_code_maps.html
index 72c9e91..1d641fa 100644 (file)
--- a/Open-ILS/web/conify/global/config/marc_code_maps.html
+++ b/Open-ILS/web/conify/global/config/marc_code_maps.html
@@ -56,9 +56,9 @@
                <script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
 
                <!-- Dojo goodness -->
-               <script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+               <script type="text/javascript" src="/js/dojo/dojo/dojo.js" data-dojo-config="parseOnLoad: true"></script>
                  <script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js"
-            djConfig="parseOnLoad: true, isDebug:false"></script>
+            data-dojo-config="parseOnLoad: true, isDebug:false"></script>
                <script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
 
                <script type="text/javascript" src="marc_code_maps.js"></script>

diff --git a/Open-ILS/web/conify/global/permission/perm_list.html b/Open-ILS/web/conify/global/permission/perm_list.html
index e6197c8..c6b0b89 100644 (file)
--- a/Open-ILS/web/conify/global/permission/perm_list.html
+++ b/Open-ILS/web/conify/global/permission/perm_list.html
@@ -56,8 +56,8 @@
                <script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
 
                <!-- Dojo goodness -->
-               <script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
-               <script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js" djConfig="parseOnLoad: true"></script>
+               <script type="text/javascript" src="/js/dojo/dojo/dojo.js" data-dojo-config="parseOnLoad: true"></script>
+               <script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js" data-dojo-config="parseOnLoad: true"></script>
                <script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
                <script language='javascript'>dojo.require('fieldmapper.AutoIDL')</script>
 

diff --git a/Open-ILS/web/opac/extras/circ/alt_holds_print.html b/Open-ILS/web/opac/extras/circ/alt_holds_print.html
index d41e76b..051c207 100644 (file)
--- a/Open-ILS/web/opac/extras/circ/alt_holds_print.html
+++ b/Open-ILS/web/opac/extras/circ/alt_holds_print.html
@@ -30,7 +30,7 @@
         <script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
         <!-- Dojo goodness -->
         <script type="text/javascript">
-            var djConfig = {parseOnLoad:true,isDebug:false,AutoIDL:['aou','aout','pgt','ahr','acp','acn']};
+            var dojoConfig = {parseOnLoad:true,isDebug:false,AutoIDL:['aou','aout','pgt','ahr','acp','acn']};
             var sort_order = ["acplo.position", "prefix", "call_number", "suffix", "request_time"];
         </script>
         <script type="text/javascript" src="/js/dojo/dojo/dojo.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 4fc4605..5c8bd75 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
@@ -12,7 +12,7 @@
 <script language='javascript' type="text/javascript">
     var locale = location.href.replace( /.+opac\/([^\/]+)\/skin.+/, '$1' );
     if (!locale) locale = '<!--#echo var="locale"-->';
-     var djConfig = {
+     var dojoConfig = {
          locale: locale.toLowerCase(),
          parseOnLoad: true,
          isDebug: false

diff --git a/Open-ILS/web/reports/oils_rpt_common.xhtml b/Open-ILS/web/reports/oils_rpt_common.xhtml
index c1aad54..a2dd2f7 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_common.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_common.xhtml
@@ -5,7 +5,7 @@
        @import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
 </style>
 <script type="text/javascript">
-       var djConfig= {
+       var dojoConfig= {
                isDebug: false,
                parseOnLoad: true
        }

diff --git a/Open-ILS/web/reports/xul/template_builder.xul b/Open-ILS/web/reports/xul/template_builder.xul
index 40fffac..7bb93de 100644 (file)
--- a/Open-ILS/web/reports/xul/template_builder.xul
+++ b/Open-ILS/web/reports/xul/template_builder.xul
@@ -16,7 +16,7 @@
 <!-- Load dojo -->
 <script type="text/javascript">
 <![CDATA[
-       var djConfig= {
+       var dojoConfig= {
                isDebug: false,
                parseOnLoad: true
        }

diff --git a/Open-ILS/xul/staff_client/chrome/content/util/shell.html b/Open-ILS/xul/staff_client/chrome/content/util/shell.html
index 32a7cc2..6e173a0 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/util/shell.html
+++ b/Open-ILS/xul/staff_client/chrome/content/util/shell.html
@@ -11,7 +11,7 @@
 <script type="text/javascript" src="/xul/server/OpenILS/data.js" />
 <script type="text/javascript" src="/xul/server/util/network.js" />
 <script type="text/javascript" src="/xul/server/util/error.js" />
-<script>var djConfig = { 'baseUrl' : '/js/dojo/dojo/',parseOnLoad: true,isDebug:false };</script>
+<script>var dojoConfig = { 'baseUrl' : '/js/dojo/dojo/',parseOnLoad: true,isDebug:false };</script>
 <script type="text/javascript" src="/js/dojo/dojo/dojo.js" />
 <script>
     try {

diff --git a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
index 3192a90..d119edf 100644 (file)
--- a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
@@ -33,7 +33,7 @@
         }
         ]]>
         </script>
-        <script>var djConfig = { 'baseUrl' : '/js/dojo/dojo/',parseOnLoad: true,isDebug:false };</script>
+        <script>var dojoConfig = { 'baseUrl' : '/js/dojo/dojo/',parseOnLoad: true,isDebug:false };</script>
         <script type="text/javascript" src="/js/dojo/dojo/dojo.js" />
         <script type="text/javascript" src="/IDL2js" />
         <script>try { dojo.require('fieldmapper.AutoIDL'); } catch(E) { alert(E); }</script>

diff --git a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
index 66c5601..f2fb4ee 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
@@ -11,8 +11,8 @@
     <head>
         <title>&staff.server.admin.copy_locations.title;</title>
         <script type="text/javascript" src='/IDL2js?aou,aout,pgt,au,acpl'></script>
-        <script type="text/javascript" djConfig="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/dojo.js"></script>
-        <script type="text/javascript" djConfig="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/openils_dojo.js"></script>
+        <script type="text/javascript" data-dojo-config="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/dojo.js"></script>
+        <script type="text/javascript" data-dojo-config="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/openils_dojo.js"></script>
         <script type="text/javascript">
             dojo.require("fieldmapper.AutoIDL");
             dojo.require("openils.widget.TranslatorPopup");

diff --git a/Open-ILS/xul/staff_client/server/admin/index.xhtml b/Open-ILS/xul/staff_client/server/admin/index.xhtml
index 60a3327..58ed57c 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/index.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/index.xhtml
@@ -10,7 +10,7 @@
     <head>
         <title>&staff.server.admin.index.title;</title>
         <script type="text/javascript" src="/js/dojo/dojo/dojo.js"
-            djConfig="parseOnLoad: true, isDebug:false"></script>
+            data-dojo-config="parseOnLoad: true, isDebug:false"></script>
         <script>
             function _l(l,p) { 
                 var url = l + location.search;

diff --git a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
index 7e53016..11ea9b6 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
@@ -24,8 +24,8 @@
         <title>&staff.server.admin.org_unit_settings.title;</title>
         <link type='text/css' rel='stylesheet' href='admin.css' />
         <script type="text/javascript" src='/IDL2js?aou,aout,pgt,au,coust,aous,csg,coustl' />
-        <script type="text/javascript" djConfig="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/dojo.js" />
-        <script type="text/javascript" djConfig="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/openils_dojo.js" />
+        <script type="text/javascript" data-dojo-config="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/dojo.js" />
+        <script type="text/javascript" data-dojo-config="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/openils_dojo.js" />
         <script type="text/javascript" src='org_unit_settings.js' />
         <script type="text/javascript" src="/xul/server/util/clipboard.js" />
         <style type="text/css">