Merge pull request #527 from trusktr/patch-1

Better support for require.js
caolan · May 19, 2015 · 7c7ca9b · 7c7ca9b
2 parents 57cf750 + ddcee3e
commit 7c7ca9b
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/lib/async.js b/lib/async.js
@@ -14,7 +14,16 @@
     // global on the server, window in the browser
     var root, previous_async;
 
-    root = this;
+    if (typeof window == 'object' && this === window) {
+        root = window;
+    }
+    else if (typeof global == 'object' && this === global) {
+        root = global;
+    }
+    else {
+        root = this;
+    }
+
     if (root != null) {
       previous_async = root.async;
     }