admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'patch-1' of https://github.com/skupr/jasmine into skupr-patch-1

Browse Source 
- Merges #1079 from @skupr
- Fixes #964
This commit is contained in:
Gregg Van Hove
2016-03-26 21:27:41 -07:00
parent 6c0224414c c302545ba4
commit f6da084642
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jasmine-core/jasmine.js
View File

@@ -23,7 +23,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
var getJasmineRequireObj = (function (jasmineGlobal) { var getJasmineRequireObj = (function (jasmineGlobal) {
var jasmineRequire; var jasmineRequire;
if (typeof module !== 'undefined' && module.exports) { if (typeof module !== 'undefined' && module.exports && typeof exports !== 'undefined') {
if (typeof global !== 'undefined') { if (typeof global !== 'undefined') {
jasmineGlobal = global; jasmineGlobal = global;
} else { } else {

2
src/core/requireCore.js
View File

@@ -1,7 +1,7 @@
var getJasmineRequireObj = (function (jasmineGlobal) { var getJasmineRequireObj = (function (jasmineGlobal) {
var jasmineRequire; var jasmineRequire;
if (typeof module !== 'undefined' && module.exports) { if (typeof module !== 'undefined' && module.exports && typeof exports !== 'undefined') {
if (typeof global !== 'undefined') { if (typeof global !== 'undefined') {
jasmineGlobal = global; jasmineGlobal = global;
} else { } else {