Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX beta] Properly detect if the environment is Node. #11895

Merged
merged 1 commit into from
Jul 26, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/loader/lib/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 || {};
Expand Down