Changeset 8007

Timestamp:

04/08/07 12:46:06 (21 months ago)

Author:

jburke

Message:

(merge from 0.4 branch) Fixes #2683. Did not fix debugAtAllCosts case with previous fix, and I was trying to fix it in the wrong way.

Files:

• dojo/trunk/_base/_loader/loader_xd.js (modified) (2 diffs)

dojo/trunk/_base/_loader/loader_xd.js

@@ -120 +120 @@
 
                 //Add to waiting packages if it is an xdomain resource.
-                if(currentIsXDomain){
+                //Don't add non-xdomain i18n bundles, those get evaled immediately.
+                if(currentIsXDomain || uri.indexOf("/nls/") == -1){
                         this.xdInFlight[module] = true;
 
@@ -172 +173 @@
                         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+')'; }