Changeset 6990

Timestamp:

01/04/07 17:45:19 (23 months ago)

Author:

jburke

Message:

Fixes #2245. Or at least improves our odds of avoiding the Safari [call stack exceeded] error. Now the tooltip and dropdowndatepicker tests work. I might be able to do more optimization of xdTraceReqs and xdEvalReqs, but I will wait for more testing to show an issue.

Files:

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

trunk/src/loader_xd.js

@@ -20 +20 @@
         this.xdDepMap = {};
         this.xdContents = [];
+        this.xdDefList = [];
 }
 
@@ -407 +408 @@
         //summary: Internal xd loader function. 
         //Does a depth first, breadth second search and eval of required modules.
-        if(reqChain.length > 0){
+        while(reqChain.length > 0){
                 var req = reqChain[reqChain.length - 1];
                 var pkg = this.xdDepMap[req];
@@ -417 +418 @@
                         var contents = this.xdContents[pkg.contentIndex];
                         if(!contents.isDefined){
-                                //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.
-                                contents.content(dojo);
+                                this.xdDefList.push(contents.content);
                                 contents.isDefined = true;
                         }
@@ -431 +429 @@
                 //Done with that require. Remove it and go to the next one.
                 reqChain.pop();
-                this.xdEvalReqs(reqChain);
         }
 }
@@ -473 +470 @@
 
         this.xdWalkReqs();
+        
+        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);
+        }
 
         //Evaluate any packages that were not evaled before.