Detect global in strict mode and WebWorkers; fixes #2152

jashkenas · May 14, 2015 · 2c0c2dd · 2c0c2dd
1 parent 4f2474c
commit 2c0c2dd
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/underscore.js b/underscore.js
@@ -8,8 +8,11 @@
   // Baseline setup
   // --------------
 
-  // Establish the root object, `window` in the browser, or `exports` on the server.
-  var root = this;
+  // Establish the root object, `window` (`self`) in the browser, or `global` on the server.
+  // We use `self` instead of `window` for `WebWorker` support.
+  var root = (typeof self == 'object' && self.self == self && self) ||
+            (typeof global == 'object' && global.global == global && global);var root = (typeof self == 'object' && self.self == self && self) ||
+            (typeof global == 'object' && global.global == global && global);
 
   // Save the previous value of the `_` variable.
   var previousUnderscore = root._;
@@ -1562,4 +1565,4 @@
       return _;
     });
   }
-}.call(this));
+}());