Permalink
Browse files

Merge pull request #257 from kevinoid/no-window-or-exports

Don't assume exports is defined when window is undefined
  • Loading branch information...
2 parents 4b48dc1 + 442f3bf commit 39a55d8f10d0d58a7151d0bde64757f95a24437b Davis W. Frank committed Sep 3, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/jasmine-core/jasmine.js
  2. +1 −1 src/core/base.js
@@ -1,4 +1,4 @@
-var isCommonJS = typeof window == "undefined";
+var isCommonJS = typeof window == "undefined" && typeof exports == "object";
/**
* Top level namespace for Jasmine, a lightweight JavaScript BDD/spec/testing framework.
View
@@ -1,4 +1,4 @@
-var isCommonJS = typeof window == "undefined";
+var isCommonJS = typeof window == "undefined" && typeof exports == "object";
/**
* Top level namespace for Jasmine, a lightweight JavaScript BDD/spec/testing framework.

0 comments on commit 39a55d8

Please sign in to comment.