[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. dd398005aa41edf7ee008892308c8840fc17b76e

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_1 has been updated
       via  dd398005aa41edf7ee008892308c8840fc17b76e (commit)
      from  90eb19cb236e84f2a90f12809588eece193a726b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dd398005aa41edf7ee008892308c8840fc17b76e
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Tue Sep 6 15:14:20 2011 -0400

    Pull in custom.js with offline/chrome overlays
    
    Or at least try to.  Main goal here is for browser.xul to see url constant
    changes from custom.js and feed them to embedded Acquisition interfaces via
    xulG.urls
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
index 413a18a..c635ab3 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
@@ -28,6 +28,27 @@
         ]]>
         </script>
         <script type="text/javascript" src="../main/constants.js" />
+        <script>
+        <![CDATA[
+            try {
+                if (typeof xulG.url_prefix != 'undefined') {
+                    dump('pulling in custom.js in util_overlay_chrome.xul\n');
+                    // Pull in local customizations
+                    var r = new XMLHttpRequest();
+                    r.open("GET", xulG.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 );
+                    }
+                } else {
+                    dump('cannot pull in custom.js in util_overlay_chrome.xul\n');
+                }
+            } catch(E) {
+                dump('cannot pull in custom.js in util_overlay_chrome.xul: ' + E + '\n');
+            }
+        ]]>
+        </script>
         <script type="text/javascript" src="util/utils.js" />
         <script type="text/javascript" src="util/CGI.js" />
         <script type="text/javascript" src="util/md5.js" />
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
index e9d2539..6990dae 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
@@ -30,6 +30,27 @@
     </script>
     <scripts id="openils_util_scripts">
         <script type="text/javascript" src="../main/constants.js" />
+        <script>
+        <![CDATA[
+            try {
+                if (typeof xulG.url_prefix != 'undefined') {
+                    dump('pulling in custom.js in util_overlay_offline.xul\n');
+                    // Pull in local customizations
+                    var r = new XMLHttpRequest();
+                    r.open("GET", xulG.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 );
+                    }
+                } else {
+                    dump('cannot pull in custom.js in util_overlay_offline.xul\n');
+                }
+            } catch(E) {
+                dump('cannot pull in custom.js in util_overlay_offline.xul: ' + E + '\n');
+            }
+        ]]>
+        </script>
         <script type="text/javascript" src="util/utils.js" />
         <script type="text/javascript" src="util/CGI.js" />
         <script type="text/javascript" src="util/md5.js" />

-----------------------------------------------------------------------

Summary of changes:
 .../chrome/content/OpenILS/util_overlay_chrome.xul |   21 ++++++++++++++++++++
 .../content/OpenILS/util_overlay_offline.xul       |   21 ++++++++++++++++++++
 2 files changed, 42 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS