Merge branch 'dev2.0' into patharray-257

jrburke · jrburke · commit d718e1028640 · 2012-05-21T21:38:08.000-07:00
diff --git a/require.js b/require.js
diff --git a/require.old.js b/require.old.js
diff --git a/tasks.txt b/tasks.txt
@@ -60,6 +60,14 @@ DOC updates:
 - text plugin: make sure to use module.config() and update doc on how to set useXhr
 - i18n plugin: make sure to use module.config() and update doc on how to set
   locale, config listing on api.html
+- enforceDefine: true,
+    - mention in error handling
+    - create errors.html section for nodefine
+    - ie9 cannot use error event listener because onreadystatechange fires first,
+      and cannot use addEventListener (which has load fire after error) because
+      of IE not firing onload right after script execution.
+    - mention how it works with shim.exports string values.
+- #scripterror document on errors page.
 
 Almond updates:
 - Support module.config.
diff --git a/tests/all.js b/tests/all.js
@@ -116,6 +116,7 @@ doh.registerUrl("pathArray", "../pathArray/pathArray.html", 8000);
 doh.registerUrl("pathArrayFail", "../pathArray/pathArrayFail.html", 8000);
 
 doh.registerUrl("undef", "../undef/undef.html", 8000);
+doh.registerUrl("undefEnforceShim", "../undef/undefEnforceShim.html", 8000);
 doh.registerUrl("undefLocal", "../undef/undefLocal.html", 8000);
 doh.registerUrl("errorContinue", "../error/errorContinue.html", 8000);
 doh.registerUrl("errorContinueLocal", "../error/errorContinueLocal.html", 8000);
diff --git a/tests/cjsSpace/cjsSpace-tests.js b/tests/cjsSpace/cjsSpace-tests.js
@@ -1,5 +1,5 @@
 require({
-        baseUrl: './',
+        baseUrl: './'
     },
     ['a'],
     function(a) {
diff --git a/tests/error/errorContinue.html b/tests/error/errorContinue.html
@@ -13,11 +13,7 @@
         }
 
         requirejs.onError = function (err) {
-
-            if (err.requireType === 'timeout') {
-                var id = err.requireModules[0],
-                    config = {paths: {}};
-
+            if (err.requireModules) {
                 setTimeout(function () {
                     requirejs(['c', 'd'], function (c, d) {
                         doh.is('c', c.name);
@@ -35,7 +31,8 @@
         };
 
         requirejs({
-            waitSeconds: 2
+            waitSeconds: 2,
+            enforceDefine: true
         }, ['a', 'b', 'broken'], function (a, b, broken) {
             doh.is("not-a", a.name);
             done();
diff --git a/tests/error/errorContinueLocal.html b/tests/error/errorContinueLocal.html
@@ -13,12 +13,13 @@
         }
 
         requirejs({
-            waitSeconds: 2
+            waitSeconds: 2,
+            enforceDefine: true
         }, ['a', 'b', 'broken'], function (a, b, broken) {
             doh.is("not-a", a.name);
             done();
         }, function (err) {
-            if (err.requireType === 'timeout') {
+            if (err.requireModules) {
                 var id = err.requireModules[0],
                     config = {paths: {}};
 
diff --git a/tests/undef/globalFoo.js b/tests/undef/globalFoo.js
@@ -0,0 +1,4 @@
+var globalFoo = {
+    name: 'globalFoo'
+};
+
diff --git a/tests/undef/undef.html b/tests/undef/undef.html
@@ -18,27 +18,26 @@
         }
 
         requirejs.onError = function (err) {
-            if (err.requireType === 'timeout') {
-                var id = err.requireModules[0],
-                    config = {paths: {}};
+            var id = err.requireModules[0],
+                config = {paths: {}};
 
-                requirejs.undef(id);
-                config.paths[id] = 'real';
+            requirejs.undef(id);
+            config.paths[id] = 'real';
 
-                requirejs.config(config);
+            requirejs.config(config);
 
-                requirejs(['dep'], function (dep) {
-                    doh.is("real", dep.name);
-                    done();
-                });
-                return;
-            }
+            requirejs(['dep'], function (dep) {
+                doh.is("real", dep.name);
+                done();
+            });
+            return;
 
             throw err;
         };
 
         requirejs({
-            waitSeconds: 2
+            waitSeconds: 2,
+            enforceDefine: true
         }, ['dep'], function (dep) {
             doh.is("real", dep.name);
             done();
diff --git a/tests/undef/undefEnforceShim.html b/tests/undef/undefEnforceShim.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>require.js: requirejs.undef() Test</title>
+    <script type="text/javascript" src="../../require.js"></script>
+    <script type="text/javascript" src="../doh/runner.js"></script>
+    <script type="text/javascript" src="../doh/_browserRunner.js"></script>
+    <script type="text/javascript">
+        var doneCount = 0;
+        var master = new doh.Deferred();
+        function done() {
+            doneCount += 1;
+            //alert("done");
+            if (doneCount == 2) {
+                //alert("master callback");
+                master.callback(true);
+            }
+        }
+
+        requirejs.onError = function (err) {
+            var id = err.requireModules[0],
+                config = {paths: {}};
+
+            if (id !== 'dep') {
+                throw new Error('onError was expecting "dep" but got: ' + id);
+            }
+
+            requirejs.undef(id);
+            config.paths[id] = 'real';
+
+            requirejs.config(config);
+
+            requirejs(['dep'], function (dep) {
+
+                doh.is("real", dep.name);
+                done();
+            });
+            return;
+
+            throw err;
+        };
+
+        requirejs({
+            waitSeconds: 2,
+            enforceDefine: true,
+            shim: {
+                'globalFoo': {
+                    exports: 'globalFoo'
+                }
+            }
+        }, ['globalFoo', 'dep'], function (globalFoo, dep) {
+            doh.is("globalFoo", globalFoo.name);
+            doh.is("real", dep.name);
+            done();
+        });
+
+        doh.register(
+            "undef",
+            [
+                {
+                    name: "undef",
+                    timeout: 5000,
+                    runTest: function () {
+                        return master;
+                    }
+                }
+            ]
+        );
+        doh.run();
+    </script>
+</head>
+<body>
+    <h1>require.js: requirejs.undef() Test</h1>
+    <p>Use requirejs.undef() to reset and load a module from a different path.</p>
+    <p>Check console for messages</p>
+</body>
+</html>
diff --git a/tests/undef/undefLocal.html b/tests/undef/undefLocal.html
@@ -13,25 +13,25 @@
         }
 
         requirejs({
-            waitSeconds: 2
+            waitSeconds: 2,
+            enforceDefine: true
         }, ['dep'], function (dep) {
             doh.is("real", dep.name);
             done();
         }, function (err) {
-            if (err.requireType === 'timeout') {
-                var id = err.requireModules[0],
-                    config = {paths: {}};
+            var id = err.requireModules[0],
+                config = {paths: {}};
 
-                requirejs.undef(id);
-                config.paths[id] = 'real';
+            if (id !== 'dep') {
+                throw new Error('onError was expecting "dep" but got: ' + id);
+            }
 
-                requirejs.config(config);
+            requirejs.undef(id);
+            config.paths[id] = 'real';
 
-                requirejs(['dep'], function () {});
-                return;
-            }
+            requirejs.config(config);
 
-            throw err;
+            requirejs(['dep'], function () {});
         });
 
         doh.register(

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +var globalFoo = {
 +    name: 'globalFoo'
 +};
++