musical scopes; note to self, get rid of the console.log() calls sometime

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 dd4f0de..3739a34 100644 (file)
--- 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
@@ -37,6 +37,8 @@
     dojo.require("openils.widget.FacetSidebar"); // pulls in Searcher and I18N
     dojo.require("openils.widget.ProgressDialog");
 
+    var cookieManager, localSuppressedOrgs;
+
     function skin_init() {
         console.log('begin skin_init()');
 
@@ -88,10 +90,14 @@
         config.css.color_2 = "color_2";
         config.css.color_3 = "color_3";
 
-        var cookieManager = new HTTP.Cookies();
+        <!--#if expr="$OILS_OPAC_FORCE_LOGIN_SSL"-->
+            forceLoginSSL = true;
+        <!--#endif -->
+
+        cookieManager = new HTTP.Cookies();
 
         // KCLS suppressed orgs
-        var localSuppressedOrgs = {1500:true, 1501:true, 1558:true};  /* change to suit */
+        localSuppressedOrgs = {1500:true, 1501:true, 1558:true};  /* change to suit */
         for (var i in orgArraySearcher) {
             var org = orgArraySearcher[i];
             if(localSuppressedOrgs[i]) {
@@ -99,10 +105,7 @@
             }
         }
 
-        <!--#if expr="$OILS_OPAC_FORCE_LOGIN_SSL"-->
-            forceLoginSSL = true;
-        <!--#endif -->
-
+        openils.Util.requireLegacy('/opac/skin/kcls/js/misc.js');
         openils.Util.requireLegacy('/opac/skin/kcls/js/depth_selector.js');
         <!--#if expr="$OILS_PAGE!='advanced.xml'"-->
         openils.Util.requireLegacy('/opac/skin/kcls/js/search_bar.js');
@@ -238,6 +241,7 @@
         config.names.rdetail.cp_status      = 'rdetail_status_cell';
 
         attachEvt("common", "init", function() {
+            console.log("a 1");
             var here = findOrgUnit(getLocation());
             if (getDepth() > 0 || getDepth === 0 ) {
                 while (getDepth() < findOrgDepth(here))
@@ -248,6 +252,7 @@
             new openils.BibTemplate(
                 { record : new CGI().param('r'), org_unit : here.shortname() }
             ).render();
+            console.log("a 2");
         });
 
         <!--#endif--> /* if rdetail.xml */
@@ -310,7 +315,7 @@
             //alert(errCounter+'\n'+errCounter2);
         });
 
-        console.log('end of main script');
+        console.log('end of skin init');
     }
 
     dojo.addOnLoad(
@@ -321,7 +326,10 @@
             <!--#if expr="$OILS_PAGE='index.xml'"-->
             isFrontPage = true;
 
-            init();
+            console.log("begin init()"); init(); console.log("end init()");
+            <!--#endif-->
+            console.log("begin opac_init()"); opac_init(); console.log("end opac_init()");
+            <!--#if expr="$OILS_PAGE='index.xml'"-->
 
             getId("home_adv_search_link").setAttribute("href", buildOPACLink({page:ADVANCED}));
             getId("home_myopac_link").setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));