[open-ils-commits] r13714 - in trunk/Open-ILS/xul/staff_client: external server/OpenILS (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-07-23 13:52:58 -0400 (Thu, 23 Jul 2009)
New Revision: 13714

Modified:
   trunk/Open-ILS/xul/staff_client/external/dojo_template.xul
   trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
Log:
Pull dojo in for all xul interfaces and use its AutoIDL fieldmapper stuff instead of fmall.js/fmgen.js



Modified: trunk/Open-ILS/xul/staff_client/external/dojo_template.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/external/dojo_template.xul	2009-07-23 16:32:27 UTC (rev 13713)
+++ trunk/Open-ILS/xul/staff_client/external/dojo_template.xul	2009-07-23 17:52:58 UTC (rev 13714)
@@ -24,12 +24,11 @@
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 	<!-- BEHAVIOR -->
 	<script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var djConfig = { 'baseUrl' : '/js/dojo/dojo/',parseOnLoad: true,isDebug:false };
+		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;
 	</script>
 	<scripts id="openils_util_scripts"/>
 
 	<script type="text/javascript" src="/xul/server/main/JSAN.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..."/>

Modified: trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul	2009-07-23 16:32:27 UTC (rev 13713)
+++ trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul	2009-07-23 17:52:58 UTC (rev 13714)
@@ -7,14 +7,14 @@
 
 	<scripts id="openils_util_scripts">
 		<script>dump('starting openils_util_overlay\n');</script>
+		<script>var djConfig = { 'baseUrl' : '/js/dojo/dojo/',parseOnLoad: true,isDebug:false };</script>
+		<script type="text/javascript" src="/js/dojo/dojo/dojo.js" />
+		<script>try { dojo.require('fieldmapper.AutoIDL'); } catch(E) { alert(E); }</script>
 		<script type="text/javascript" src="/xul/server/main/constants.js" />
 		<script type="text/javascript" src="/xul/server/util/clipboard.js" />
 		<script type="text/javascript" src="/opac/common/js/utils.js" />
 		<script type="text/javascript" src="/opac/common/js/CGI.js" />
 		<script type="text/javascript" src="/opac/common/js/md5.js" />
-		<script type="text/javascript" src="/opac/common/js/JSON_v1.js" />
-		<script type="text/javascript" src="/opac/common/js/fmall.js" />
-		<script type="text/javascript" src="/opac/common/js/fmgen.js" />
 		<script type="text/javascript" src="/opac/common/js/RemoteRequest.js" />
 		<script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js' />
 		<script type="text/javascript" src="/opac/common/js/org_utils.js" />