From 632175739531b963a1c37198fccffe4dd94e2d7b Mon Sep 17 00:00:00 2001
From: Bill Erickson <erickson@esilibrary.com>
Date: Wed, 15 Dec 2010 12:25:41 -0500
Subject: [PATCH] making results page happy in non-ff

---
 Open-ILS/web/opac/skin/kcls/js/result_common.js      |  8 +++++---
 Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml |  4 ----
 .../opac/skin/kcls/xml/common/js_common_postbody.xml |  4 ----
 Open-ILS/web/opac/skin/kcls/xml/common/sidebar.xml   | 20 ++++++++++----------
 .../web/opac/skin/kcls/xml/result/result_table.xml   |  4 ++--
 5 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/Open-ILS/web/opac/skin/kcls/js/result_common.js b/Open-ILS/web/opac/skin/kcls/js/result_common.js
index 413cac8b5a..47b9e9446c 100644
--- a/Open-ILS/web/opac/skin/kcls/js/result_common.js
+++ b/Open-ILS/web/opac/skin/kcls/js/result_common.js
@@ -4,7 +4,9 @@ var recordsCache = [];
 var lowHitCount = 4;
 var isbnList = '';
 var googleBooksLink = true;
-buildOrgSel($('holdsCacheSel'), globalOrgTree, 0);
+
+// TODO: test
+dojo.addOnLoad(function(){ buildOrgSel($('holdsCacheSel'), globalOrgTree, 0);});
 
 var resultFetchAllRecords = false;
 var resultCompiledSearch = null;
@@ -34,8 +36,8 @@ config.names.result.item_author = "item_author";
 config.names.result.counts_row  = "counts_row";
 config.names.result.count_cell  = "copy_count_cell";
 config.names.result.format_cell = 'result_table_format_cell';
-config.names.result.format_link = 'resource_link'
-config.names.result.format_pic  = 'format_pic'
+config.names.result.format_link = 'resource_link';
+config.names.result.format_pic  = 'format_pic';
 
 /* set up the event handlers */
 if( findCurrentPage() == MRESULT || findCurrentPage() == RRESULT ) {
diff --git a/Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml b/Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml
index d88358bb8e..e6e2886051 100644
--- a/Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml
+++ b/Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml
@@ -62,10 +62,6 @@
 
 <script src="<!--#echo var='OILS_SKIN_BASE'-->/kcls/js/misc.js" type='text/javascript'></script>
 
-<!--#if expr="$FRONT_PAGE!='true'"-->
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/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/kcls/js/search_bar.js'></script>
 <!--#endif-->
diff --git a/Open-ILS/web/opac/skin/kcls/xml/common/js_common_postbody.xml b/Open-ILS/web/opac/skin/kcls/xml/common/js_common_postbody.xml
index 0cc7a6845a..8b2bb39662 100644
--- a/Open-ILS/web/opac/skin/kcls/xml/common/js_common_postbody.xml
+++ b/Open-ILS/web/opac/skin/kcls/xml/common/js_common_postbody.xml
@@ -159,10 +159,6 @@
         config.css.myopac = {};
         config.names.myopac = {};
 
-        <!--#if expr="$FRONT_PAGE!='true'"-->
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/password_reset.js');
-        <!--#endif -->
-
         <!--#if expr="$OILS_PAGE='rresult.xml'"-->
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar_extras.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/rresult.js');
diff --git a/Open-ILS/web/opac/skin/kcls/xml/common/sidebar.xml b/Open-ILS/web/opac/skin/kcls/xml/common/sidebar.xml
index f54fea1441..b761a1e17d 100644
--- a/Open-ILS/web/opac/skin/kcls/xml/common/sidebar.xml
+++ b/Open-ILS/web/opac/skin/kcls/xml/common/sidebar.xml
@@ -67,17 +67,17 @@
                 var fblob = this;
                 setTimeout(
                     function() {
-                        attachEvt("result", "allRecordsReceived", function () {
-                            if(!resultFacetKey) return;					
-                            if (fblob.facetCacheKey) return; // already rendered it
+                        attachEvt("result", "allRecordsReceived", 
+                            function () {
+                                if(!resultFacetKey) return;					
+                                if (fblob.facetCacheKey) return; // already rendered it
 					        
-                            dojo.removeClass('facetSidebarContainer','hide_me');
-        
-                            fblob.facetCacheKey = resultFacetKey;
-                            fblob.render();
-                        }
-                    }
-                );
+                                dojo.removeClass('facetSidebarContainer','hide_me');
+            
+                                fblob.facetCacheKey = resultFacetKey;
+                                fblob.render();
+                            }
+                    )}, 0);
             ]]></script>
         </div>
 	</div>
diff --git a/Open-ILS/web/opac/skin/kcls/xml/result/result_table.xml b/Open-ILS/web/opac/skin/kcls/xml/result/result_table.xml
index 3c26d367b1..b9decaa6e8 100644
--- a/Open-ILS/web/opac/skin/kcls/xml/result/result_table.xml
+++ b/Open-ILS/web/opac/skin/kcls/xml/result/result_table.xml
@@ -169,14 +169,14 @@
    <!-- ====================== -->
 
     <!-- ChiliFresh setup -->
-    <!--if expr="${OILS_CHILIFRESH_ACCOUNT} && ${OILS_CHILIFRESH_ACCOUNT}!='(none)'"-->
+    <!--#if expr="${OILS_CHILIFRESH_ACCOUNT} && ${OILS_CHILIFRESH_ACCOUNT}!='(none)'"-->
         <input type="hidden" id="chilifresh_account" name="chilifresh_account"
             value="<!--#echo var='OILS_CHILIFRESH_ACCOUNT'-->" />
         <input type="hidden" id="chilifresh_profile" name="chilifresh_profile"
             value="<!--#echo var='OILS_CHILIFRESH_PROFILE'-->" />
         <input type="hidden" id="chilifresh_version" name="chilifresh_version" value="onsite_v1" />
         <input type="hidden" id="chilifresh_type" name="chilifresh_type" value="search" />
-    <!--endif-->
+    <!--#endif-->
 </div>
 <![CDATA[<!-- ****************** end: result_table.xml ***************************** -->]]>
 
-- 
2.11.0