Changeset 7401

Timestamp:

02/22/07 11:53:00 (21 months ago)

Author:

jburke

Message:

(merge from 0.4 branch) References #2366. Fixes issue where loading local i18n bundles failed.

Files:

• trunk/src/loader_xd.js (modified) (2 diffs)

trunk/src/loader_xd.js

@@ -120 +120 @@
 
                 //Add to waiting packages.
-                this.xdInFlight[module] = true;
+                //Only add it if not a non-xdomain i18n resource bundle.
+                if(!currentIsXDomain && uri.indexOf("/nls/") == -1){
+                        this.xdInFlight[module] = true;
+                }
 
                 //Increment inFlightCount
@@ -157 +160 @@
                 if(contents == null){ return 0; /*boolean*/}
                 
-                if(this.isXDomain){
+                //If this is not xdomain, or if loading a i18n resource bundle, then send it down
+                //the normal eval/callback path.
+                if(this.isXDomain && uri.indexOf("/nls/") == -1){
                         var pkg = this.createXdPackage(contents, module, uri);
                         dj_eval(pkg);