From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 22 Oct 2010 16:19:49 +0000 (+0000)
Subject: Move dojo loading around to avoid the "white screen of death" in Firefox and xulrunne... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e46a50392c5fda982ea0e38808244682413836cb;p=contrib%2FConifer.git

Move dojo loading around to avoid the "white screen of death" in Firefox and xulrunner (See: o.dojotoolkit.org/forum/dojo-foundation/general-discussion/firefox-3-fires-domcontentloaded-event-prematurely )

git-svn-id: svn://svn.open-ils.org/ILS/trunk@18446 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/web/opac/skin/default/xml/body.xml b/Open-ILS/web/opac/skin/default/xml/body.xml
index 38ae5259d5..41068c2360 100644
--- a/Open-ILS/web/opac/skin/default/xml/body.xml
+++ b/Open-ILS/web/opac/skin/default/xml/body.xml
@@ -46,4 +46,15 @@
         });]]>
     </script>
 
+    <script language="javascript" type="text/javascript">
+        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>
+
 </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 952d1d2280..a2a428fa28 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
@@ -65,14 +65,3 @@
 	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js' type='text/javascript'></script>
 	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/init.js' type='text/javascript'></script>
 	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/added_content.js' type='text/javascript'></script>
-
-	<script language="javascript" type="text/javascript">
-		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>
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 0b60ce8a73..a20a13301e 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
@@ -51,6 +51,17 @@
             }
         });]]>
     </script>
+
+    <script language="javascript" type="text/javascript">
+        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>
 </body>
 
 
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
index b18ff47431..039b42df87 100644
--- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
@@ -208,7 +208,7 @@
 		config.ids.rdetail.image				= 'rdetail_image';
 		config.ids.rdetail.tor_pic				= 'rdetail_tor_pic';
 
-        dojo.addOnLoad( function () {
+        setTiemout( function () {
             var here = findOrgUnit(getLocation());
             if (getDepth() > 0 || getDepth === 0 ) {
                 while (getDepth() < findOrgDepth(here))
@@ -217,7 +217,7 @@
 
             dojo.require('openils.BibTemplate');
             new openils.BibTemplate({ record : new CGI().param('r'), org_unit : here.shortname() }).render();
-        });
+        }, 0);
 	]]></script>
 
 </div> <!-- details_body -->