From: Bill Erickson <erickson@esilibrary.com>
Date: Tue, 14 Dec 2010 20:30:29 +0000 (-0500)
Subject: using browser detection in js_common (via ssi), have  FF/Xulrunner load the postbody... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=13ecde7a49312ed11e6315ce54821ed6db342813;p=evergreen%2Fequinox.git

using browser detection in js_common (via ssi), have  FF/Xulrunner load the postbody JS loader and all other browsers load the regular js_common content, w/ some slight changes to keep inline JS out of the picture.  This is all because IE treats JS loaded vis legacyRequire as running in the non-global scope, which pretty much breaks all the code loaded in this fashion
---

diff --git a/Open-ILS/web/opac/skin/default/js/advanced.js b/Open-ILS/web/opac/skin/default/js/advanced.js
index dc4689f340..ccdc6ad304 100644
--- a/Open-ILS/web/opac/skin/default/js/advanced.js
+++ b/Open-ILS/web/opac/skin/default/js/advanced.js
@@ -176,5 +176,6 @@ function __setsortsel() {
     } else $("adv_global_sort_dir").disabled = false;
 }
 
-__setsortsel();
+setTimeout(__setsortsel, 100);
+
 console.log("end advanced.js");
diff --git a/Open-ILS/web/opac/skin/default/js/holds.js b/Open-ILS/web/opac/skin/default/js/holds.js
index 0e95c40e4a..5ecf30a8e1 100644
--- a/Open-ILS/web/opac/skin/default/js/holds.js
+++ b/Open-ILS/web/opac/skin/default/js/holds.js
@@ -41,10 +41,12 @@ function holdsHandleStaff() {
     };
 }
 
-$('holds_frozen_thaw_input').onchange = 
-        function(){holdsVerifyThawDateUI('holds_frozen_thaw_input');}
-$('holds_frozen_thaw_input').onkeyup = 
-        function(){holdsVerifyThawDateUI('holds_frozen_thaw_input');}
+setTimeout(function() {
+    $('holds_frozen_thaw_input').onchange = 
+            function(){holdsVerifyThawDateUI('holds_frozen_thaw_input');}
+    $('holds_frozen_thaw_input').onkeyup = 
+            function(){holdsVerifyThawDateUI('holds_frozen_thaw_input');}
+    }, 100);
 
 function _holdsHandleStaffMe() {
 	holdArgs.recipient = G.user;
diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js
index db63725bce..2ba2ae53cd 100644
--- a/Open-ILS/web/opac/skin/default/js/myopac.js
+++ b/Open-ILS/web/opac/skin/default/js/myopac.js
@@ -22,6 +22,7 @@ function clearNodes( node, keepArray ) {
 function myOPACInit() {
 
     fieldmapper.IDL.load(['mous']);
+    $('myopac_holds_actions_none').selected = true;
 
     var orgHiding = checkOrgHiding();
     if (orgHiding) {
diff --git a/Open-ILS/web/opac/skin/default/js/rdetail.js b/Open-ILS/web/opac/skin/default/js/rdetail.js
index 14bd7278c3..08e8319464 100644
--- a/Open-ILS/web/opac/skin/default/js/rdetail.js
+++ b/Open-ILS/web/opac/skin/default/js/rdetail.js
@@ -556,7 +556,7 @@ function _rdetailDraw(r) {
         try {
             chili_init();
         } catch(E) {
-            dump(E + '\n');
+            console.log(E + '\n');
             hideMe($('rdetail_reviews_link'));
             hideMe($('rdetail_chilifresh_reviews'));
         }
diff --git a/Open-ILS/web/opac/skin/default/js/result_common.js b/Open-ILS/web/opac/skin/default/js/result_common.js
index 9c7953c274..c13ca27904 100644
--- a/Open-ILS/web/opac/skin/default/js/result_common.js
+++ b/Open-ILS/web/opac/skin/default/js/result_common.js
@@ -718,7 +718,7 @@ function fetchGoogleBooksLink () {
 
 function fetchChiliFreshReviews() {
     if (chilifresh && chilifresh != '(none)') {
-        try { chili_init(); } catch(E) { dump(E + '\n'); }
+        try { chili_init(); } catch(E) { console.log(E + '\n'); }
     }
 }
 
diff --git a/Open-ILS/web/opac/skin/default/xml/body.xml b/Open-ILS/web/opac/skin/default/xml/body.xml
index 818bac98e4..b9b3bb866f 100644
--- a/Open-ILS/web/opac/skin/default/xml/body.xml
+++ b/Open-ILS/web/opac/skin/default/xml/body.xml
@@ -35,6 +35,8 @@
         </div>
     </center>
 
-    <!--#include virtual='common/js_common_postbody.xml'-->
+<!--#if expr="$HTTP_USER_AGENT = /Firefox/ || $HTTP_USER_AGENT = /Xulrunner/" -->
+<!--#include virtual='common/js_common_postbody.xml'-->
+<!--#endif-->
 
 </body>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
index 31b692650d..82ce698b9a 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
@@ -15,11 +15,319 @@
 <!--#if expr="$OILS_PAGE='myopac.xml'"-->
 <!-- my acccount uses a lot more classes -->
 <script language='javascript'
-    src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs,accs,au,ahr,ahrn,acn,actscecm,cbreb,cbreb,cbrebi,acp,cust,ac,aua,mous,circ,mbts,mb,ausp,csp'>
+    src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs,au,accs,ahr,ahrn,acn,actscecm,cbreb,cbreb,cbrebi,acp,cust,ac,aua,mous,circ,mbts,mb,ausp,csp,acpl'>
 </script>
 <!--#else-->
 <script language='javascript'
-    src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs'>
+    src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs,au'>
 </script>
 <!--#endif-->
 
+
+<!--#if expr="$HTTP_USER_AGENT = /Firefox/ || $HTTP_USER_AGENT = /Xulrunner/" -->
+<!-- Load all Firefox/Xulrunner JS just prior to </body> -->
+<!--#else-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/JSON_v1.js'></script>
+<script language='javascript' type="text/javascript" src='/js/dojo/opensrf/opensrf.js'></script>
+<script language='javascript' type="text/javascript" src='/js/dojo/dojo/openils_dojo.js'></script>
+<script language='javascript' type="text/javascript" src='/js/dojo/fieldmapper/AutoIDL.js'></script>
+
+<script language='javascript' type="text/javascript" src='<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/OrgTree.js'></script>
+<script language='javascript' type="text/javascript" src='<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/FacetDefs.js'></script>
+<script language='javascript' type="text/javascript" src='<!--#echo var="OILS_JS_BASE"-->/OrgLasso.js'></script>
+
+<!--#if expr="$OILS_OPAC_COMBINED_JS"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/combined.js'></script>
+<!--#else --> 
+<!-- 
+    When combined JS is enabled in the Apache config, the block 
+    below defines which files are added to the final combined JS file. 
+    Currently, only files in $OPAC/common/js/ are eligible for automatic combination.
+-->
+<!--START COMPRESSION-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/config.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/CGI.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/md5.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/slimtree.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/opac_utils.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/org_utils.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/init.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/added_content.js'></script>
+<!--END COMPRESSION--> 
+<!--#endif -->
+
+<!--#if expr="$FRONT_PAGE!='true'"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/password_reset.js'></script>
+<!--#endif -->
+
+<!--#if expr="$OILS_PAGE!='advanced.xml'"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/search_bar.js'></script>
+<!--#endif-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/depth_selector.js'></script>
+
+<!--#if expr="$OILS_PAGE='rresult.xml'"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rresult.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/tips.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar.js'></script>
+<!--#endif-->
+
+<!--#if expr="$OILS_PAGE='rdetail.xml'"-->
+
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rresult.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rdetail.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/cn_browse.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/copy_details.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.js'></script>
+
+<!--#endif-->
+
+
+<!--#if expr="$OILS_PAGE='myopac.xml'"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/myopac.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar.js'></script>
+
+<!--#endif-->
+
+<!--#if expr="$OILS_PAGE='mresult.xml'"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/mresult.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/tips.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'></script>
+<!--#endif-->
+
+<!--#if expr="$OILS_PAGE='cnbrowse.xml'"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/cn_browse.js'></script>
+<!--#endif-->
+
+<!--#if expr="$OILS_PAGE='advanced.xml'"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/advanced.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/adv_global.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar.js'></script>
+<!--#endif-->
+
+
+<!-- Some global js -->
+<script language='javascript' type='text/javascript'><![CDATA[
+    config.css.color_1 = "color_1";
+    config.css.color_2 = "color_2";
+    config.css.color_3 = "color_3";
+    <!-- set up some global JS config variables, read from the Apache config -->
+    var OILS_OPAC_IMAGES_HOST = null;
+    <!--#if expr="$OILS_OPAC_IMAGES_HOST"-->
+        OILS_OPAC_IMAGES_HOST = '<!--#echo var="OILS_OPAC_IMAGES_HOST"-->extras/ac/jacket/';
+    <!--#endif -->
+    var OILS_OPAC_STATIC_PROTOCOL = null;
+    <!--#if expr="$OILS_OPAC_STATIC_PROTOCOL"-->
+        OILS_OPAC_STATIC_PROTOCOL = '<!--#echo var="OILS_OPAC_STATIC_PROTOCOL"-->';
+    <!--#endif -->
+    <!-- builds the "Now searching: <org_unit>" text on the home page -->
+    function home_init() {
+        getId("home_adv_search_link").setAttribute("href", buildOPACLink({page:ADVANCED})); 
+        getId("home_myopac_link").setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));
+
+        try {
+            dojo.style(dojo.byId('toptable'), 'display', 'table');
+        } catch(e) {
+            try {
+                dojo.style(dojo.byId('toptable'), 'display', '');
+            } catch(ee) {}
+        }
+    }
+
+    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_OPAC_FORCE_LOGIN_SSL"-->
+        forceLoginSSL = true;
+    <!--#endif -->
+
+        config.ids.searchbar = {};
+        config.css.searchbar = {};
+        config.ids.searchbar.text                = 'search_box';
+        config.ids.searchbar.submit            = 'search_submit';
+        config.ids.searchbar.type_selector    = 'search_type_selector';
+        config.ids.searchbar.depth_selector    = 'depth_selector';
+        config.ids.searchbar.form_selector    = 'form_selector';
+        config.ids.searchbar.extra_row        = 'searchbar_extra';
+        config.ids.searchbar.main_row            = 'searchbar_main_row';
+        config.ids.searchbar.table                = 'searchbar_table';
+        config.ids.searchbar.location_tag    = 'search_location_tag_link';
+        config.ids.searchbar.lib_sel_span    = 'lib_selector_span';
+        config.ids.searchbar.lib_sel_link    = 'lib_selector_link';
+        config.ids.searchbar.depth_sel_span    = 'depth_selector_span';
+        config.ids.altcanvas.org_tree        = config.ids.common.org_container;
+        config.ids.altcanvas.holds            = 'holds_box';
+        config.ids.altcanvas.check_holds    = 'check_holds_box';
+        config.ids.altcanvas.xulholds        = 'xulholds_box';
+        config.ids.altcanvas.loading        = 'loading_alt';
+        config.ids.common.now_searching = 'now_searching_location';
+        config.ids.searchbar = {};
+        config.css.searchbar = {};
+        config.ids.searchbar.text                = 'search_box';
+        config.ids.searchbar.facets                = 'facet_box';
+        config.ids.searchbar.submit            = 'search_submit';
+        config.ids.searchbar.type_selector    = 'search_type_selector';
+        config.ids.searchbar.depth_selector    = 'depth_selector';
+        config.ids.searchbar.form_selector    = 'form_selector';
+        config.ids.searchbar.extra_row        = 'searchbar_extra';
+        config.ids.searchbar.main_row            = 'searchbar_main_row';
+        config.ids.searchbar.table                = 'searchbar_table';
+        config.ids.searchbar.location_tag    = 'search_location_tag_link';
+        config.ids.searchbar.lib_sel_span    = 'lib_selector_span';
+        config.ids.searchbar.lib_sel_link    = 'lib_selector_link';
+        config.ids.searchbar.depth_sel_span    = 'depth_selector_span';
+        config.ids.common.top_logo = "top_left_logo";
+        config.ids.sidebar = {};
+        config.css.sidebar = {};
+        config.names.sidebar = {};
+        config.css.sidebar.item = {};
+        config.ids.sidebar.home                = 'home_link_div';
+        config.ids.sidebar.advanced        = 'advanced_link_div';
+        config.ids.sidebar.myopac            = 'myopac_link_div';
+        config.ids.sidebar.prefs            = 'prefs_link_div';
+        config.ids.sidebar.mresult            = 'mresult_link_div';
+        config.ids.sidebar.rresult            = 'result_link_div';
+        config.ids.sidebar.rdetail            = "rdetail_link_div";
+        config.ids.sidebar.login            = 'login_link';
+        config.ids.sidebar.logout            = 'logout_link';
+        config.ids.sidebar.logoutbox        = 'logout_link_div';
+        config.ids.sidebar.loginbox        = 'login_link_div';
+        config.ids.sidebar.logged_in_as    = 'logged_in_as_div';
+        config.ids.sidebar.username_dest    = 'username_dest';
+
+        config.ids.sidebar.home_link        = 'home_link'
+        config.ids.sidebar.advanced_link    = 'advanced_link'
+        config.ids.sidebar.myopac_link    = 'myopac_link'
+
+        config.css.encircled                = 'encircled';
+
+        config.ids.login = {};
+        config.css.login = {};
+        config.ids.login.form            = "login_form";
+        config.ids.login.box            = "login_box";
+        config.ids.login.tbody            = "login_tbody";
+        config.ids.login.username    = "login_username";
+        config.ids.login.password    = "login_password";
+        config.ids.login.button        = "login_button";
+        config.ids.login.cancel        = "login_cancel_button";
+        config.ids.altcanvas.login            = config.ids.login.box;
+
+        config.ids.altcanvas.myopac_reload = 'myopac_reloading';
+        config.ids.myopac = {};
+        config.css.myopac = {};
+        config.names.myopac = {};
+
+
+        <!--#if expr="$OILS_PAGE='rdetail.xml'"-->
+
+        config.ids.rdetail              = {};
+        config.ids.rdetail.view_marc    = "rdetail_view_marc";
+        config.ids.rdetail.details_body = 'rdetail_details_body';
+        config.ids.rdetail.title        = 'rdetail_title';
+        config.ids.rdetail.author       = 'rdetail_author';
+        config.ids.rdetail.isbn         = 'rdetail_isbn';
+        config.ids.rdetail.edition      = 'rdetail_edition';
+        config.ids.rdetail.pubdate      = 'rdetail_pubdate';
+        config.ids.rdetail.publisher    = 'rdetail_publisher';
+        config.ids.rdetail.tor          = 'rdetail_tor';
+        config.ids.rdetail.abstr        = 'rdetail_abstract';
+        config.ids.rdetail.image        = 'rdetail_image';
+        config.ids.rdetail.tor_pic      = 'rdetail_tor_pic';
+
+        config.ids.rdetail.cp_status        = "rdetail_copy_info_status";
+        config.ids.rdetail.cp_info_row      = "rdetail_copy_info_row";
+        config.ids.rdetail.cp_info_loading  = "rdetail_copy_info_loading";
+        config.ids.rdetail.cp_info_local    = "copy_info_local_link";
+        config.ids.rdetail.cp_info_all      = "copy_info_all_link";
+        config.ids.rdetail.cp_info_none     = "rdetail_copy_info_none";
+        config.names.rdetail.lib_cell       = "rdetail_library_cell";
+        config.names.rdetail.cn_cell        = "rdetail_callnumber_cell";
+        config.names.rdetail.cp_count_cell  = "rdetail_copy_count_cell";
+        config.names.rdetail.cp_status      = 'rdetail_status_cell';
+
+        attachEvt("common", "init", function() {
+            var here = findOrgUnit(getLocation());
+            if (getDepth() > 0 || getDepth === 0 ) {
+                while (getDepth() < findOrgDepth(here))
+                    here = findOrgUnit( here.parent_ou() );
+            }
+
+            dojo.require('openils.BibTemplate');
+            new openils.BibTemplate(
+                { record : new CGI().param('r'), org_unit : here.shortname() }
+            ).render();
+        });
+
+        <!--#endif--> /* if rdetail.xml */
+
+        /* I'm not sure how to test for the situation where this block is
+           needed, but this won't hurt. */
+        try {
+            if ($('holds_frozen_chkbox').checked)
+                unHideMe($("hold_frozen_thaw_row"));
+        } catch (E) {
+            void(0);
+        }
+
+        <!--#if expr="$OILS_PAGE='index.xml'"-->
+        isFrontPage = true;
+        dojo.addOnLoad(home_init);
+        <!--#endif-->
+
+    dojo.addOnLoad(init);
+    dojo.require("dijit._Calendar");
+    dojo.require("dijit.form.DateTextBox");
+    dojo.require("dijit.form.FilteringSelect");
+    dojo.require("dojo.date.locale");
+    dojo.require("dojo.date.stamp");
+    dojo.require("dojo.parser");
+    dojo.require("openils.widget.FacetSidebar"); // pulls in Searcher and I18N
+
+
+]]> </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-->
+
+
+<!--#if expr="$HTTP_USER_AGENT = /MSIE/"-->
+<script language='javascript' type='text/javascript' 
+    src='<!--#echo var="OILS_PROTOCOL"-->://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js'></script>
+<script><![CDATA[
+    dojo.addOnLoad(
+        function() {
+            CFInstall.check({
+                preventPrompt: true,
+                onmissing: function() {
+                    if (dojo.cookie("noGCF") != "true")
+                        unHideMe($('gcfPrompt'));
+                }
+            });
+        }
+    );
+]]></script>
+<!--#endif-->
+
+
+
+<!--#endif-->
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 f3d5b8af59..301e482a27 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
@@ -57,21 +57,6 @@
         /* END COMPRESSION */
         <!--#endif -->
 
-        if(dojo.isIE) {
-            setTimeout(
-                function() {
-                    openils.Util.requireLegacy('http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js');
-                    CFInstall.check({
-                        preventPrompt: true,
-                        onmissing: function() {
-                            if (dojo.cookie("noGCF") != "true")
-                                unHideMe($('gcfPrompt'));
-                        }
-                    });
-            }, 0);
-        }
-
-
         config.css.color_1 = "color_1";
         config.css.color_2 = "color_2";
         config.css.color_3 = "color_3";
@@ -234,8 +219,6 @@
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar.js');
 
-        $('myopac_holds_actions_none').selected = true;
-
         <!--#endif-->
 
         <!--#if expr="$OILS_PAGE='mresult.xml'"-->
diff --git a/Open-ILS/web/opac/skin/default/xml/home/index_body.xml b/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
index a81a72d755..ec0aa9b5be 100644
--- a/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
+++ b/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
@@ -30,7 +30,9 @@
         </div>
     </center>
 
+    <!--#if expr="$HTTP_USER_AGENT = /Firefox/ || $HTTP_USER_AGENT = /Xulrunner/" -->
     <!--#include virtual='../common/js_common_postbody.xml'-->
+    <!--#endif-->
 </body>