From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 23 Jul 2009 17:52:58 +0000 (+0000)
Subject: Pull dojo in for all xul interfaces and use its AutoIDL fieldmapper stuff instead... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=20324185bb38b98e53be2690619992205a36883a;p=evergreen%2Ftadl.git

Pull dojo in for all xul interfaces and use its AutoIDL fieldmapper stuff instead of fmall.js/fmgen.js



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

diff --git a/Open-ILS/xul/staff_client/external/dojo_template.xul b/Open-ILS/xul/staff_client/external/dojo_template.xul
index 9535e1e712..f154820c5c 100644
--- a/Open-ILS/xul/staff_client/external/dojo_template.xul
+++ b/Open-ILS/xul/staff_client/external/dojo_template.xul
@@ -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..."/>
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 382b34cefb..ef47b073db 100644
--- a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
@@ -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" />