[open-ils-commits] r18447 - in branches/rel_2_0/Open-ILS/web/opac/skin/default/xml: . common home rdetail (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-10-22 12:21:07 -0400 (Fri, 22 Oct 2010)
New Revision: 18447

Modified:
   branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/body.xml
   branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
   branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
   branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
Log:
Move dojo loading around to avoid the "white screen of death" in Firefox and xulrunner (See: http://o.dojotoolkit.org/forum/dojo-foundation/general-discussion/firefox-3-fires-domcontentloaded-event-prematurely )

Modified: branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/body.xml
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/body.xml	2010-10-22 16:19:49 UTC (rev 18446)
+++ branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/body.xml	2010-10-22 16:21:07 UTC (rev 18447)
@@ -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>

Modified: branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/common/js_common.xml	2010-10-22 16:19:49 UTC (rev 18446)
+++ branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/common/js_common.xml	2010-10-22 16:21:07 UTC (rev 18447)
@@ -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>

Modified: branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/home/index_body.xml	2010-10-22 16:19:49 UTC (rev 18446)
+++ branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/home/index_body.xml	2010-10-22 16:21:07 UTC (rev 18447)
@@ -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>
 
 

Modified: branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml	2010-10-22 16:19:49 UTC (rev 18446)
+++ branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml	2010-10-22 16:21:07 UTC (rev 18447)
@@ -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 -->