Got paths array working, but still needs evaluation.

jrburke · jrburke · commit 71c12ef8f150 · 2012-05-19T22:57:24.000-07:00
diff --git a/require.js b/require.js
@@ -628,7 +628,7 @@ var requirejs, require, define;
                 noLoads = [],
                 stillLoading = false,
                 needCycleCheck = true,
-                map, modId, err;
+                map, modId, err, usingPathFallback;
 
             //Do not bother if this call was a result of a cycle break.
             if (inCheckLoaded) {
@@ -660,6 +660,7 @@ var requirejs, require, define;
                         //Pop off the first array value, since it failed, and
                         //retry
                         pathConfig.shift();
+                        usingPathFallback = true;
                         stillLoading = true;
                         context.undef(modId);
                         context.require([modId]);
@@ -720,7 +721,7 @@ var requirejs, require, define;
             //If still waiting on loads, and the waiting load is something
             //other than a plugin resource, or there are still outstanding
             //scripts, then just try back later.
-            if (!expired && stillLoading) {
+            if ((!expired || usingPathFallback) && stillLoading) {
                 //Something is still waiting to load. Wait for it, but only
                 //if a timeout is not already in effect.
                 if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) {
diff --git a/tests/all.js b/tests/all.js
@@ -112,6 +112,9 @@ if (typeof Worker !== "undefined") {
     doh.registerUrl("workers", "../workers.html");
 }
 
+doh.registerUrl("pathArray", "../pathArray/pathArray.html", 8000);
+doh.registerUrl("pathArrayFail", "../pathArray/pathArrayFail.html", 8000);
+
 doh.registerUrl("undef", "../undef/undef.html", 8000);
 doh.registerUrl("undefLocal", "../undef/undefLocal.html", 8000);
 doh.registerUrl("errorContinue", "../error/errorContinue.html", 8000);
diff --git a/tests/pathArray/pathArray.html b/tests/pathArray/pathArray.html
@@ -6,7 +6,8 @@
     <script type="text/javascript" src="../doh/runner.js"></script>
     <script type="text/javascript" src="../doh/_browserRunner.js"></script>
     <script type="text/javascript">
-        var master = new doh.Deferred();
+        var master = new doh.Deferred(),
+            threwError = false;
 
         requirejs.onError = function (err) {
             threwError = true;

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,9 @@ if (typeof Worker !== "undefined") {`
`112`	`112`	`doh.registerUrl("workers", "../workers.html");`
`113`	`113`	`}`
`114`	`114`
	`115`	`+doh.registerUrl("pathArray", "../pathArray/pathArray.html", 8000);`
	`116`	`+doh.registerUrl("pathArrayFail", "../pathArray/pathArrayFail.html", 8000);`
	`117`	`+`
`115`	`118`	`doh.registerUrl("undef", "../undef/undef.html", 8000);`
`116`	`119`	`doh.registerUrl("undefLocal", "../undef/undefLocal.html", 8000);`
`117`	`120`	`doh.registerUrl("errorContinue", "../error/errorContinue.html", 8000);`