backporting r14443 and r14444 from trunk: xul + dojo can not use dojo.addOnLoad or...

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

diff --git a/Open-ILS/web/reports/xul/template_builder.xul b/Open-ILS/web/reports/xul/template_builder.xul
index 921ee0b..a5c60f8 100644 (file)
--- a/Open-ILS/web/reports/xul/template_builder.xul
+++ b/Open-ILS/web/reports/xul/template_builder.xul
@@ -11,14 +11,14 @@
        <!--#include virtual="/opac/locale/${locale}/reports.dtd"-->
 ]>
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xhtml="http://www.w3.org/1999/xhtml" onload="loadIDL()">
 
 <!-- Load dojo -->
 <script type="text/javascript">
 <![CDATA[
        var djConfig= {
                isDebug: false,
-               parseOnLoad: true
+               parseOnLoad: false
        }
 ]]>
 </script>
@@ -54,12 +54,6 @@
 <script src="transforms.js" type="application/x-javascript; e4x=1"/>
 <script src="operators.js" type="application/x-javascript; e4x=1"/>
 
-<script type="text/javascript">
-<![CDATA[
-       dojo.addOnLoad(loadIDL);
-]]>
-</script>
-
 <script type="application/x-javascript; e4x=1" src="/opac/common/js/jscalendar/calendar.js"/>
 <script type="application/x-javascript; e4x=1" src="/opac/common/js/jscalendar/lang/calendar-en.js"/>
 <script type="application/x-javascript; e4x=1" src="/opac/common/js/jscalendar/calendar-setup.js"/>