Changeset 8177

Timestamp:

04/19/07 16:43:27 (21 months ago)

Author:

jburke

Message:

Fixes #2771. An edge case when loading local and remote modules via xd.

Location:

branches/0.4/src

Files:

• hostenv_browser.js (modified) (1 diff)
• loader_xd.js (modified) (3 diffs)

branches/0.4/src/hostenv_browser.js

@@ -273 +273 @@
         }
 
+        dojo.hostenv._djInitFired = false;
         //      BEGIN DOMContentLoaded, from Dean Edwards (http://dean.edwards.name/weblog/2006/06/again/)
         function dj_load_init(e){
+                dojo.hostenv._djInitFired = true;
                 // allow multiple calls, only first one will take effect
                 // A bug in khtml calls events callbacks for document for event which isnt supported

branches/0.4/src/loader_xd.js

@@ -541 +541 @@
         //Clear inflight count so we will finally do finish work.
         this.inFlightCount = 0; 
-        this.callLoaded();
+        
+        //Only trigger call loaded if dj_load_init has run.
+        if(this._djInitFired && !this.loadNotifying){
+                this.callLoaded();
+        }
 }
 
@@ -574 +578 @@
         if(this.xdHasCalledPreload || dojo.hostenv.getModulePrefix("dojo") == "src" || !this.localesGenerated){
                 this.xdRealCallLoaded();
-                this.xdHasCalledPreload = true;
         }else{
                 if(this.localesGenerated){
@@ -583 +586 @@
                         this.preloadLocalizations();
                 }
-                this.xdHasCalledPreload = true;
-        }
-}
+        }
+        this.xdHasCalledPreload = true;
+}