[open-ils-commits] r13713 - trunk/Open-ILS/xul/staff_client/external (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-07-23 12:32:27 -0400 (Thu, 23 Jul 2009)
New Revision: 13713

Modified:
   trunk/Open-ILS/xul/staff_client/external/dojo_template.js
   trunk/Open-ILS/xul/staff_client/external/dojo_template.xul
Log:
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

Modified: trunk/Open-ILS/xul/staff_client/external/dojo_template.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/external/dojo_template.js	2009-07-23 15:00:02 UTC (rev 13712)
+++ trunk/Open-ILS/xul/staff_client/external/dojo_template.js	2009-07-23 16:32:27 UTC (rev 13713)
@@ -9,16 +9,7 @@
         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(
             {

Modified: trunk/Open-ILS/xul/staff_client/external/dojo_template.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/external/dojo_template.xul	2009-07-23 15:00:02 UTC (rev 13712)
+++ trunk/Open-ILS/xul/staff_client/external/dojo_template.xul	2009-07-23 16:32:27 UTC (rev 13713)
@@ -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..."/>