moved chilifresh and novelest back out into script tags, cuz they can't be loaded...

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 0827797..f0c9020 100644 (file)
--- 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
@@ -16,13 +16,6 @@
     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');
@@ -37,7 +30,6 @@
     dojo.require("openils.widget.FacetSidebar"); // pulls in Searcher and I18N
 
     function skin_init() {
-        console.log('begin skin_init()');
 
         openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/OrgTree.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/FacetDefs.js');
@@ -65,8 +57,6 @@
         /* END COMPRESSION */
         <!--#endif -->
 
-        console.log('middle of main script');
-
         if(dojo.isIE) {
             setTimeout(
                 function() {
@@ -273,8 +263,6 @@
         } catch (E) {
             void(0);
         }
-
-        console.log('end of main script');
     }
 
     dojo.addOnLoad(
@@ -303,3 +291,12 @@
         }
     );
 ]]></script>
+
+<!-- these can't be loaded via XHR -->
+<!--#if expr="$OILS_CHILIFRESH_ACCOUNT && $OILS_CHILIFRESH_ACCOUNT != '(none)'"-->
+<script type='text/javascript' src='<!--#echo var='OILS_CHILIFRESH_URL'-->'></script>
+<!--#endif-->
+<!--#if expr="${OILS_NOVELIST_URL} && ${OILS_NOVELIST_URL}!='(none)'"-->
+<script type='text/javascript' src='<!--#echo var='OILS_NOVELIST_URL'-->'></script>
+<!--#endif-->
+