Merge pull request #1518 from platinumazure/close-over-settimeout

Avoid issues caused by clobbering of global setTimeout
requirejs · Mar 28, 2016 · 3b5407e · 3b5407e
2 parents c4b74da + 9d95c7b
commit 3b5407e
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/require.js b/require.js
@@ -8,7 +8,7 @@
 /*global window, navigator, document, importScripts, setTimeout, opera */
 
 var requirejs, require, define;
-(function (global) {
+(function (global, setTimeout) {
     var req, s, head, baseElement, dataMain, src,
         interactiveScript, currentlyAddingScript, mainScript, subPath,
         version = '2.2.0',
@@ -2139,4 +2139,4 @@ var requirejs, require, define;
 
     //Set up with config info.
     req(cfg);
-}(this));
+}(this, setTimeout));
diff --git a/tests/all.js b/tests/all.js
@@ -7,6 +7,8 @@ var hasToString = (function () {
 
 doh.registerUrl("simple", "../simple.html");
 
+doh.registerUrl("setTimeout", "../setTimeout.html");
+
 //PS3 does not like this test
 doh.registerUrl("baseUrl", "../baseUrl.html");
 

diff --git a/tests/setTimeout-tests.js b/tests/setTimeout-tests.js
@@ -0,0 +1,25 @@
+(function (global) {
+    // Store local setTimeout reference for monkey-patching DOH
+    var localSetTimeout = global.setTimeout;
+
+    // Clobber setTimeout to ensure that the below require() still works...
+    global.setTimeout = null;
+
+    // ...but ensure doh.setTimeout does not get broken
+    doh.setTimeout = function (fn, delay) {
+    	return localSetTimeout.call(global, fn, delay);
+    };
+
+    require({ baseUrl: "./" }, ["simple"], function(simple) {
+        doh.register(
+            "setTimeout",
+            [
+                function checkSetTimeout(t){
+                    t.is("blue", simple.color);
+                }
+            ]
+        );
+
+        doh.run();
+    });
+})(this);
diff --git a/tests/setTimeout.html b/tests/setTimeout.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>require.js: setTimeout 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" src="setTimeout-tests.js"></script>
+</head>
+<body>
+    <h1>require.js: setTimeout Test</h1>
+    <p>Check console for messages</p>
+</body>
+</html>