[open-ils-commits] r17819 - in trunk/Open-ILS/xul/staff_client: chrome/content/main server/OpenILS (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-09-19 18:44:16 -0400 (Sun, 19 Sep 2010)
New Revision: 17819

Modified:
   trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
   trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
Log:
remove redundant invocation of custom.js, and tweak how menu.js loads it


Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js	2010-09-19 19:17:14 UTC (rev 17818)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js	2010-09-19 22:44:16 UTC (rev 17819)
@@ -54,19 +54,19 @@
 
     'init' : function( params ) {
 
+        var obj = this;
+
         urls.remote = params['server'];
 
         // Pull in local customizations
         var r = new XMLHttpRequest();
-        r.open("GET", url_prefix('/xul/server/skin/custom.js'), false);
+        r.open("GET", obj.url_prefix('/xul/server/skin/custom.js'), false);
         r.send(null);
         if (r.status == 200) {
             dump('Evaluating /xul/server/skin/custom.js\n');
             eval( r.responseText );
         }
 
-        var obj = this;
-
         var button_bar = String( obj.data.hash.aous['ui.general.button_bar'] ) == 'true';
         if (button_bar) {
             var x = document.getElementById('main_toolbar');

Modified: trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul	2010-09-19 19:17:14 UTC (rev 17818)
+++ trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul	2010-09-19 22:44:16 UTC (rev 17819)
@@ -13,7 +13,6 @@
         <script>try { dojo.require('dojo.date.locale'); } catch(E) { alert(E); }</script>
         <script>try { dojo.require('dojo.date.stamp'); } catch(E) { alert(E); }</script>
         <script type="text/javascript" src="/xul/server/main/constants.js" />
-        <script type="text/javascript" src="/xul/server/skin/custom.js" />
         <script type="text/javascript" src="/xul/server/OpenILS/data.js" />
         <script type="text/javascript" src="/xul/server/util/barcode.js" />
         <script type="text/javascript" src="/xul/server/util/browser.js" />