Merge pull request #11895 from brzpegasus/node-detection

[BUGFIX beta] Properly detect if the environment is Node.
emberjs · Jul 26, 2015 · 6e00835 · 6e00835
2 parents 68719dd + 97b1a3d
commit 6e00835
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/packages/loader/lib/main.js b/packages/loader/lib/main.js
@@ -2,7 +2,8 @@ var define, requireModule, require, requirejs, Ember;
 var mainContext = this;
 
 (function() {
-  var isNode = typeof process !== 'undefined' && {}.toString.call(process) === '[object process]';
+  var isNode = typeof window === 'undefined' &&
+    typeof process !== 'undefined' && {}.toString.call(process) === '[object process]';
 
   if (!isNode) {
     Ember = this.Ember = this.Ember || {};