From a45f5f0d522b8effbf3881dd0f9189270e9d268a Mon Sep 17 00:00:00 2001
From: Bill Erickson <erickson@esilibrary.com>
Date: Mon, 13 Dec 2010 15:01:27 -0500
Subject: [PATCH] move global chilifresh and novelist vars out into global
 scope

---
 .../skin/default/xml/common/js_common_postbody.xml | 31 +++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
index 27fc624450..5f6ddd2901 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
@@ -11,6 +11,19 @@
         OILS_OPAC_STATIC_PROTOCOL = '<!--#echo var="OILS_OPAC_STATIC_PROTOCOL"-->';
     <!--#endif -->
 
+    var chilifresh = '<!--#echo var="OILS_CHILIFRESH_ACCOUNT"-->';
+    if (chilifresh == '(none)') { chilifresh = false; }
+    var novelist = '<!--#echo var="OILS_NOVELIST_URL"-->';
+    if (novelist == '(none)') { novelist = false; }
+
+    <!--#if expr="$OILS_CHILIFRESH_ACCOUNT && $OILS_CHILIFRESH_ACCOUNT != (none)"-->
+    openils.Util.requireLegacy('<!--#echo var='OILS_CHILIFRESH_URL'-->');
+    <!--#endif-->
+
+    <!--#if expr="${OILS_NOVELIST_URL} && ${OILS_NOVELIST_URL}!='(none)'"-->
+    openils.Util.requireLegacy('<!--#echo var='OILS_NOVELIST_URL'-->');
+    <!--#endif-->
+
     openils.Util.requireLegacy('/js/dojo/dojo/openils_dojo.js');
     openils.Util.requireLegacy('/js/dojo/fieldmapper/AutoIDL.js');
 
@@ -149,6 +162,7 @@
         <!--#endif-->
 
         <!--#if expr="$OILS_PAGE='rdetail.xml'"-->
+
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js');
@@ -198,22 +212,7 @@
             ).render();
         });
 
-        var chilifresh = '<!--#echo var="OILS_CHILIFRESH_ACCOUNT"-->';
-        if (chilifresh == '(none)') { chilifresh = false; }
-        var novelist = '<!--#echo var="OILS_NOVELIST_URL"-->';
-        if (novelist == '(none)') { novelist = false; }
-
-        <!--#if expr="$OILS_CHILIFRESH_ACCOUNT && $OILS_CHILIFRESH_ACCOUNT != (none)"-->
-        openils.Util.requireLegacy('<!--#echo var='OILS_CHILIFRESH_URL'-->');
-        <!--#endif-->
-
-        <!--#if expr="${OILS_NOVELIST_URL} && ${OILS_NOVELIST_URL}!='(none)'"-->
-        openils.Util.requireLegacy('<!--#echo var='OILS_NOVELIST_URL'-->');
-        <!--#endif-->
-
-
-
-        <!--#endif-->
+        <!--#endif--> <!-- if rdetail.xml -->
 
         <!--#if expr="$OILS_PAGE='advanced.xml'"-->
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/advanced.js');
-- 
2.11.0