From: Bill Erickson <erickson@esilibrary.com>
Date: Wed, 15 Dec 2010 19:18:45 +0000 (-0500)
Subject: some cleanup to get FF working
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1cc7d52d57de65abd9f0eb0fe14fe9b6ba33d578;p=evergreen%2Fequinox.git

some cleanup to get FF working
---

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 742c68232c..e9b7c28cf3 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
@@ -33,46 +33,48 @@
     dojo.require("openils.widget.ProgressDialog");
     dojo.require("openils.widget.FacetSidebar"); // pulls in Searcher and I18N
 
-    function 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');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/OrgLasso.js');
-
-        <!--#if expr="$OILS_OPAC_COMBINED_JS"-->
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/combined.js')
-        <!--#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 */
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/utils.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/config.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/CGI.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/md5.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/slimtree.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/opac_utils.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/org_utils.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/init.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/added_content.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/DP_DateExtensions.js');
-        /* END COMPRESSION */
-        <!--#endif -->
+    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');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/OrgLasso.js');
+
+    <!--#if expr="$OILS_OPAC_COMBINED_JS"-->
+    openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/combined.js')
+    <!--#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 */
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/utils.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/config.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/CGI.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/md5.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/slimtree.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/opac_utils.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/org_utils.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/init.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/added_content.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/DP_DateExtensions.js');
+    /* END COMPRESSION */
+    <!--#endif -->
 
-        /*  -----------------------------------------------------------------------
-            KCLS suppressed orgs 
-            ----------------------------------------------------------------------- */
-        var localSuppressedOrgs = {1500:true, 1501:true, 1558:true};  /* change to suit */
-        for (var i in orgArraySearcher) {
-            var org = orgArraySearcher[i];
-            if(localSuppressedOrgs[i]) {
-                org.opac_visible('f');
-            }
+    /*  -----------------------------------------------------------------------
+        KCLS suppressed orgs 
+        ----------------------------------------------------------------------- */
+    var localSuppressedOrgs = {1500:true, 1501:true, 1558:true};  /* change to suit */
+    for (var i in orgArraySearcher) {
+        var org = orgArraySearcher[i];
+        if(localSuppressedOrgs[i]) {
+            org.opac_visible('f');
         }
-        /* ----------------------------------------------------------------------- */ 
+    }
+    /* ----------------------------------------------------------------------- */ 
+
+    function skin_init() {
+
 
         <!--#if expr="$OILS_OPAC_FORCE_LOGIN_SSL"-->
             forceLoginSSL = true;
diff --git a/Open-ILS/web/opac/skin/kcls/xml/page_advanced.xml b/Open-ILS/web/opac/skin/kcls/xml/page_advanced.xml
index 4d28b2d651..de7e994d9c 100644
--- a/Open-ILS/web/opac/skin/kcls/xml/page_advanced.xml
+++ b/Open-ILS/web/opac/skin/kcls/xml/page_advanced.xml
@@ -7,8 +7,6 @@
 </div>
 <div id='canvas_main' class='canvas' style='border:1px solid #174B79;clear:both;'>
 
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/advanced.js'></script>
-
 	<style type='text/css'>
 		.advanced_div { text-align: center; margin: 8px; margin-left: 2px; width: 95%; padding: 5px; }
 	</style>
diff --git a/Open-ILS/web/opac/skin/kcls/xml/rdetail/rdetail_summary.xml b/Open-ILS/web/opac/skin/kcls/xml/rdetail/rdetail_summary.xml
index 6b5190f6fb..4f8564e6c0 100644
--- a/Open-ILS/web/opac/skin/kcls/xml/rdetail/rdetail_summary.xml
+++ b/Open-ILS/web/opac/skin/kcls/xml/rdetail/rdetail_summary.xml
@@ -19,7 +19,7 @@
 								"large": buildISBNSrc(plausible_ident(content), "large")
 							};
 						</span>
-						<a id='rdetail_img_link' href='${ident.large}'><img alt="Image of item" style='border: none;' id='rdetail_image' src='${ident.small}' onload='unHideMe($("rdetail_img_link"))' onerror='hideMe($("rdetail.jacket_attrib_div"));hideMe($("rdetail_img_link"));'/></a><br />
+						<a id='rdetail_img_link' href='${ident.large}'><img alt="Image of item" style='border: none;' id='rdetail_image' src='${ident.small}' onload='dojo.addOnLoad(function(){unHideMe($("rdetail_img_link"))});' onerror='dojo.addOnLoad(function(){hideMe($("rdetail.jacket_attrib_div"));hideMe($("rdetail_img_link"));})'/></a><br />
 					</span>
 
                     <!-- vendor attribution link -->