Changeset 13534

Timestamp:

05/01/08 16:55:58 (7 months ago)

Author:

jburke

Message:

Refs #5887: move afterOnLoad kickoff after the dojo.config.require work in dojo._base.

Location:

branches/1.1

Files:

• dojo/_base/_loader/hostenv_browser.js (modified) (1 diff)
• util/buildscripts/jslib/dojoGuardEnd.jsfrag (modified) (1 diff)

branches/1.1/dojo/_base/_loader/hostenv_browser.js

@@ -262 +262 @@
         }
 
-        if(dojo.config.afterOnLoad){
-                //Dojo is being added to the page after page load, so just trigger
-                //the init sequence after a timeout. Using a timeout so the rest of this
-                //script gets evaluated properly.
-                window.setTimeout(dojo._fakeLoadInit, 1000);
-        }else{
+        if(!dojo.config.afterOnLoad){
                 //      START DOMContentLoaded
                 // Mozilla and Opera 9 expose the event we could use

branches/1.1/util/buildscripts/jslib/dojoGuardEnd.jsfrag

@@ +1 @@
+
+        if(dojo.config.afterOnLoad && dojo.isBrowser){
+                //Dojo is being added to the page after page load, so just trigger
+                //the init sequence after a timeout. Using a timeout so the rest of this
+                //script gets evaluated properly. This work needs to happen after the
+                //dojo.config.require work done in dojo._base.
+                window.setTimeout(dojo._fakeLoadInit, 1000);
+        }
 
 })();