Changeset 7885

Timestamp:

03/31/07 21:40:49 (22 months ago)

Author:

jburke

Message:

(merge from 0.4 branch) Fixes #2683. Loading local modules after page load should work now.

Location:

trunk

Files:

• src/loader_xd.js (modified) (1 diff)
• tests/loader/2683 (copied) (copied from branches/0.4/tests/loader/2683)

trunk/src/loader_xd.js

@@ -172 +172 @@
                         var pkg = this.createXdPackage(contents, module, uri);
                         dj_eval(pkg);
+                        //When loading local modules only, there will be no
+                        //modules in flight. In that case, trigger the xd
+                        //resolution right away. Otherwise, there are issues
+                        //with dojo.addOnLoad() calls added after loading only
+                        //local modules after the page load.
+                        if(this.inFlightCount == 0){
+                                this.watchInFlightXDomain();
+                        }
                 }else{
                         if(cb){ contents = '('+contents+')'; }