Changeset 7099

Timestamp:

01/26/07 17:02:53 (22 months ago)

Author:

jburke

Message:

Fixes #2212 and #2282. Now can debug local modules when running in xdomain mode, and bootstrap2.js is no longer needed.

Location:

branches/0.4

Files:

• buildscripts/build.xml (modified) (2 diffs)
• buildscripts/buildUtil.js (modified) (3 diffs)
• buildscripts/setXdDojoConfig.js (added)
• dojo.js (modified) (2 diffs)
• src/bootstrap2.js (deleted)
• src/browser_debug.js (modified) (1 diff)
• src/browser_debug_xd.js (added)
• src/debug.js (modified) (1 diff)
• src/hostenv_adobesvg.js (modified) (1 diff)
• src/hostenv_browser.js (modified) (1 diff)
• src/hostenv_jsc.js (modified) (1 diff)
• src/hostenv_rhino.js (modified) (1 diff)
• src/hostenv_spidermonkey.js (modified) (1 diff)
• src/hostenv_svg.js (modified) (1 diff)
• src/hostenv_wsh.js (modified) (1 diff)
• src/loader_xd.js (modified) (8 diffs)
• tests/test_bootstrap.html (modified) (1 diff)

branches/0.4/buildscripts/build.xml

@@ -11 +11 @@
                   should we support these as HTML? Or just JS files?
                   NOTE: the following command issued from the top-level seems to work correctly:
-                        perl buildscripts/jslink.pl -pre cat -i release/testUsage.js -l src/bootstrap1.js -l src/bootstrap2.js -l src/hostenv_browser.js -l src/io/IO.js -l src/io/BrowserIO.js -o - > release/minimal.js
+                        perl buildscripts/jslink.pl -pre cat -i release/testUsage.js -l src/bootstrap1.js -l src/hostenv_browser.js -l src/io/IO.js -l src/io/BrowserIO.js -o - > release/minimal.js
                   This correctly "links" the files together, but mangles some
                   identifiers and places anonymous inner functions at the wrong places
@@ -716 +716 @@
         <!-- end buildFlash task -->
 
+        <!-- intern-strings task -->
+        <target name="xd-dojo-config" depends="-fix-config"
+                description="Sets dojo.js to use xdomain loading and sets dojo module path to a specific URL.">
+                <java jar="./lib/custom_rhino.jar" failonerror="true" fork="true"
+                        logError="true">
+                        <arg value="setXdDojoConfig.js" />
+                        <arg value="${release_dir}/dojo.js" />
+                        <arg value="${xdDojoUrl}" />
+                </java>
+        </target>
+        <!-- end intern-strings task -->
+
         <!-- xdgenRelease task -->
         <target name="xdgenRelease" if="xdgenRun" depends="xdgenRemove, -set-profileFile">

branches/0.4/buildscripts/buildUtil.js

@@ -44 +44 @@
                 load("../src/loader.js");
                 load("../src/hostenv_rhino.js");
-                load("../src/bootstrap2.js");
         
                 // FIXME: is this really what we want to say?
@@ -73 +72 @@
                 dojo.hostenv.loadedUris.push("../src/hostenv_"+hostenvType+".js");
         }
-        
-        dojo.hostenv.loadedUris.push("../src/bootstrap2.js");
         
         if(dependencies["prefixes"]){
@@ -269 +266 @@
                 //Make sure we have a JS string and not a Java string by using new String().
                 dojoContents += new String(readFile(depList[i])) + "\r\n";
-                if(!insertedProvideMarker && depList[i].indexOf("bootstrap2.js") != -1){
+                if(!insertedProvideMarker && depList[i].indexOf("hostenv_") != -1){
                         dojoContents += "__DOJO_PROVIDE_INSERTION__";
                         insertedProvideMarker = true;

branches/0.4/dojo.js

@@ -25 +25 @@
                         tmps.splice(1, 0, "hostenv_browser.js");
                 }
-        
-                tmps.push("bootstrap2.js");
-        
+
                 if((this["djConfig"])&&(djConfig["baseScriptUri"])){
                         var root = djConfig["baseScriptUri"];
@@ -60 +58 @@
                 }
         
-                if((this["djConfig"])&&((djConfig["isDebug"])||(djConfig["debugAtAllCosts"]))){
-                        tmps.push("debug.js");
-                }
-        
-                if((this["djConfig"])&&(djConfig["debugAtAllCosts"])&&(!isRhino)&&(!isDashboard)){
-                        tmps.push("browser_debug.js");
-                }
-        
-                //Support compatibility packages. Right now this only allows setting one
-                //compatibility package. Might need to revisit later down the line to support
-                //more than one.
-                if((this["djConfig"])&&(djConfig["compat"])){
-                        tmps.push("compat/" + djConfig["compat"] + ".js");
-                }
-        
                 var loaderRoot = root;
                 if((this["djConfig"])&&(djConfig["baseLoaderUri"])){

branches/0.4/src/browser_debug.js

@@ +1 @@
+dojo.provide("dojo.browser_debug");
+
 dojo.hostenv.loadedUris.push("../src/bootstrap1.js");
 dojo.hostenv.loadedUris.push("../src/loader.js");
 dojo.hostenv.loadedUris.push("../src/hostenv_browser.js");
-dojo.hostenv.loadedUris.push("../src/bootstrap2.js");
 dojo.hostenv._loadedUrisListStart = dojo.hostenv.loadedUris.length;
 

branches/0.4/src/debug.js

@@ +1 @@
+dojo.provide("dojo.debug");
+
 dojo.debug = function(/*...*/){
         // summary:

branches/0.4/src/hostenv_adobesvg.js

@@ -499 +499 @@
 }
 */
+
+dojo.requireIf((djConfig["isDebug"] || djConfig["debugAtAllCosts"]), "dojo.debug");

branches/0.4/src/hostenv_browser.js

@@ -527 +527 @@
 
 } //if (typeof window != 'undefined')
+
+//Load debug code if necessary.
+dojo.requireIf((djConfig["isDebug"] || djConfig["debugAtAllCosts"]), "dojo.debug");
+
+//window.widget is for Dashboard detection
+//The full conditionals are spelled out to avoid issues during builds.
+//Builds may be looking for require/requireIf statements and processing them.
+dojo.requireIf(djConfig["debugAtAllCosts"] && !window.widget && !djConfig["useXDomain"], "dojo.browser_debug");
+dojo.requireIf(djConfig["debugAtAllCosts"] && !window.widget && djConfig["useXDomain"], "dojo.browser_debug_xd");

branches/0.4/src/hostenv_jsc.js

@@ -65 +65 @@
         return System.Environment.GetCommandLineArgs()[0];
 }
+
+dojo.requireIf((djConfig["isDebug"] || djConfig["debugAtAllCosts"]), "dojo.debug");

branches/0.4/src/hostenv_rhino.js

@@ -246 +246 @@
         thread.start();
 }
+
+dojo.requireIf((djConfig["isDebug"] || djConfig["debugAtAllCosts"]), "dojo.debug");

branches/0.4/src/hostenv_spidermonkey.js

@@ -67 +67 @@
 }
 
+dojo.requireIf((djConfig["isDebug"] || djConfig["debugAtAllCosts"]), "dojo.debug");
 

branches/0.4/src/hostenv_svg.js

@@ -212 +212 @@
         };
 }
+
+dojo.requireIf((djConfig["isDebug"] || djConfig["debugAtAllCosts"]), "dojo.debug");

branches/0.4/src/hostenv_wsh.js

@@ -35 +35 @@
 
 dojo.hostenv.exit = function(exitcode){ WScript.Quit(exitcode); }
+
+dojo.requireIf((djConfig["isDebug"] || djConfig["debugAtAllCosts"]), "dojo.debug");

branches/0.4/src/loader_xd.js

@@ -11 +11 @@
         //the xhr package until the one before it finishes loading. The text of the xhr package will be converted
         //to match the format for a xd package and put in the xd load queue.
-        //You can force all packages to be treated as xd by setting the djConfig.forceXDomain.
-        this.isXDomain = djConfig.forceXDomain || false;
+        this.isXDomain = djConfig.useXDomain || false;
 
         this.xdTimer = 0;
@@ -25 +24 @@
 dojo.hostenv.resetXd();
 
-dojo.hostenv.createXdPackage = function(/*String*/contents){
+dojo.hostenv.createXdPackage = function(/*String*/contents, /*String*/resourceName, /*String=*/resourcePath){
         //summary: Internal xd loader function. Creates an xd module source given an
         //non-xd module contents.
@@ -58 +57 @@
         output.push("\ndefinePackage: function(dojo){");
         output.push(contents);
-        output.push("\n}});");
+        //Add isLocal property so we know if we have to do something different
+        //in debugAtAllCosts situations.
+        output.push("\n}, resourceName: '" + resourceName + "', resourcePath: '" + resourcePath + "'});");
         
         return output.join(""); //String
@@ -161 +162 @@
                 
                 if(this.isXDomain){
-                        var pkg = this.createXdPackage(contents);
+                        var pkg = this.createXdPackage(contents, module, uri);
                         dj_eval(pkg);
                 }else{
@@ -224 +225 @@
 
                 //Save off the package contents for definition later.
-                var contentIndex = this.xdContents.push({content: pkg.definePackage, isDefined: false}) - 1;
+                var contentIndex = this.xdContents.push({
+                                content: pkg.definePackage,
+                                resourceName: pkg["resourceName"],
+                                resourcePath: pkg["resourcePath"],
+                                isDefined: false
+                        }) - 1;
 
                 //Add provide/requires to dependency map.
@@ -417 +423 @@
                         var contents = this.xdContents[pkg.contentIndex];
                         if(!contents.isDefined){
-                                this.xdDefList.push(contents.content);
+                                var content = contents.content;
+                                content["resourceName"] = contents["resourceName"];
+                                content["resourcePath"] = contents["resourcePath"];
+                                this.xdDefList.push(content);
                                 contents.isDefined = true;
                         }
@@ -472 +481 @@
         var defLength = this.xdDefList.length;
         for(var i= 0; i < defLength; i++){
-                //Evaluate the package to bring it into being.
-                //Pass dojo in so that later, to support multiple versions of dojo
-                //in a page, we can pass which version of dojo to use.
-                dojo.hostenv.xdDefList[i](dojo);
+                var content = dojo.hostenv.xdDefList[i];
+                if(djConfig["debugAtAllCosts"] && content["resourceName"]){
+                        if(!this["xdDebugQueue"]){
+                                this.xdDebugQueue = [];
+                        }
+                        this.xdDebugQueue.push({resourceName: content.resourceName, resourcePath: content.resourcePath});
+                }else{
+                        //Evaluate the package to bring it into being.
+                        //Pass dojo in so that later, to support multiple versions of dojo
+                        //in a page, we can pass which version of dojo to use.                  
+                        content(dojo);
+                }
         }
 
@@ -494 +511 @@
         this.resetXd();
 
+        if(this["xdDebugQueue"] && this.xdDebugQueue.length > 0){
+                this.xdDebugFileLoaded();
+        }else{
+                this.xdNotifyLoaded();
+        }
+}
+
+dojo.hostenv.xdNotifyLoaded = function(){
         //Clear inflight count so we will finally do finish work.
         this.inFlightCount = 0; 

branches/0.4/tests/test_bootstrap.html

@@ -9 +9 @@
 <script language="JavaScript" type="text/javascript" src="../src/loader.js"></script>
 <script language="JavaScript" type="text/javascript" src="../src/hostenv_browser.js"></script>
-<script language="JavaScript" type="text/javascript" src="../src/bootstrap2.js"></script>
 
 </head>