From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 23 Jul 2009 16:32:27 +0000 (+0000)
Subject: Thanks to miker_ and dojo 1.3.2, the <script> tag for loading dojo works now (if... 
X-Git-Tag: sprint4-merge-nov22~9621
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a91fc093887628f761b62e92ea5dfbbda00a9c12;p=working%2FEvergreen.git

Thanks to miker_ and dojo 1.3.2, the <script> tag for loading dojo works now (if you configure djConfig in inline javascript rather than as an attribute on the script tag itself, and dojo.require() works if djConfig is given the baseUrl for dojo.js

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

diff --git a/Open-ILS/xul/staff_client/external/dojo_template.js b/Open-ILS/xul/staff_client/external/dojo_template.js
index a3bac8fae4..99eca39871 100644
--- a/Open-ILS/xul/staff_client/external/dojo_template.js
+++ b/Open-ILS/xul/staff_client/external/dojo_template.js
@@ -9,16 +9,7 @@ function my_init() {
         JSAN.use('util.error'); error = new util.error();
         error.sdump('D_TRACE','my_init() for main_test.xul');
 
-        /* these were not working as <script> tags.  Maybe someone else can try? */
-        var url="/js/dojo/dojo/dojo.js"; var js = JSAN._loadJSFromUrl( url ); eval(js);
-        url="/js/dojo/DojoSRF.js"; js = JSAN._loadJSFromUrl( url ); eval(js);
-        url="/js/dojo/fieldmapper/Fieldmapper.js"; js = JSAN._loadJSFromUrl( url ); eval(js);
-        url="/js/dojo/fieldmapper/hash.js"; js = JSAN._loadJSFromUrl( url ); eval(js);
-        url="/js/dojo/fieldmapper/OrgUtils.js"; js = JSAN._loadJSFromUrl( url ); eval(js);
-        url="/js/dojo/openils/Event.js"; js = JSAN._loadJSFromUrl( url ); eval(js);
-        url="/js/dojo/openils/Util.js"; js = JSAN._loadJSFromUrl( url ); eval(js);
-        url="/js/dojo/openils/User.js"; js = JSAN._loadJSFromUrl( url ); eval(js);
-        url="/js/dojo/openils/PermaCrud.js"; js = JSAN._loadJSFromUrl( url ); eval(js);
+        dojo.require('openils.PermaCrud');
 
         var types = new openils.PermaCrud(
             {
diff --git a/Open-ILS/xul/staff_client/external/dojo_template.xul b/Open-ILS/xul/staff_client/external/dojo_template.xul
index 32d123532e..9535e1e712 100644
--- a/Open-ILS/xul/staff_client/external/dojo_template.xul
+++ b/Open-ILS/xul/staff_client/external/dojo_template.xul
@@ -24,13 +24,12 @@
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 	<!-- BEHAVIOR -->
 	<script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; 
+		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var djConfig = { 'baseUrl' : '/js/dojo/dojo/',parseOnLoad: true,isDebug:false };
 	</script>
 	<scripts id="openils_util_scripts"/>
 
 	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/opac/common/js/opensrf.js"/>
-	<script type="text/javascript" src="/opac/common/js/opensrf_xhr.js"/>
+    <script type="text/javascript" src="/js/dojo/dojo/dojo.js"/>
 	<script type="text/javascript" src="dojo_template.js"/>
 
     <label value="retrieving coust's with dojo and PermaCrud..."/>