Changeset 7590

Timestamp:

03/14/07 12:42:45 (22 months ago)

Author:

jburke

Message:

Fix for xdomain 18n resource loading. Previous change to get local i18n bundles to work was flawed. Also rolling back previous buildUtilXd.js since I do not think it is part of the problem. Fixed a test for IE.

Location:

branches/0.4

Files:

• buildscripts/buildUtilXd.js (modified) (1 diff)
• src/loader_xd.js (modified) (1 diff)
• tests/i18n/test_strings.html (modified) (1 diff)

branches/0.4/buildscripts/buildUtilXd.js

@@ -113 +113 @@
 
         //Final XD file contents.
-        var provideString = 'dojo.provide("' + moduleName + '.nls.' + (localeName ? localeName + '.' : '') + bundleName + '");';
-
-        fileContents = provideString
+        fileContents = 'dojo.provide("' + moduleName + '.nls.' + (localeName ? localeName + '.' : '') + bundleName + '");'
                          + 'dojo.hostenv.xdLoadFlattenedBundle("' + moduleName + '", "' + bundleName
                    + '", "' + localeName + '", ' + fileContents + ');';
 
-        //Now make a proper xd.js file out of the content, but
-        //only include the dojo.provide statement. We'll leave the bundle contents outside of the
-        //xd wrapper.
-        var bundleContents = buildUtilXd.makeXdContents(provideString, baseRelativePath, prefixes);
-        
-        //Just inline the real contents right in the file. Its ok if bundles are evaluated right
-        //away since they don't have dependencies.
-        bundleContents += fileContents;
-        
-        return bundleContents;
+        //Now make a proper xd.js file out of the content.
+        return buildUtilXd.makeXdContents(fileContents, baseRelativePath, prefixes);
 }
 //END makeXdBundleContents function

branches/0.4/src/loader_xd.js

@@ -119 +119 @@
                 this.xdOrderedReqs.push(module);
 
-                //Add to waiting packages.
-                //Only add it if not a non-xdomain i18n resource bundle.
-                if(currentIsXDomain && uri.indexOf("/nls/") == -1){
+                //Add to waiting packages if it is an xdomain resource.
+                if(currentIsXDomain){
                         this.xdInFlight[module] = true;
-                }
-
-                //Increment inFlightCount
-                //This will stop the modulesLoaded from firing all the way.
-                this.inFlightCount++;
-                                
+
+                        //Increment inFlightCount
+                        //This will stop the modulesLoaded from firing all the way.
+                        this.inFlightCount++;
+                }
+
                 //Start timer
                 if(!this.xdTimer){

branches/0.4/tests/i18n/test_strings.html

@@ -6 +6 @@
                         djConfig = { 
                                 isDebug: true,
-                                baseScriptUri: "../../", //for xdomain testing.
+                                baseScriptUri: "../../" //for xdomain testing.
                         };
                 </script>