Skip to content

Commit 664e7f8

Browse files
committed
Update freeGlobal assignment in platform.js and qunit-extras to work in node-webkit.
1 parent b3fa916 commit 664e7f8

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

platform.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@
2121
/** Detect free variable `exports` */
2222
var freeExports = objectTypes[typeof exports] && exports;
2323

24-
/** Detect free variable `global`, from Node.js or Browserified code, and use it as `root` */
25-
var freeGlobal = objectTypes[typeof global] && global;
26-
if (freeGlobal && (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal)) {
24+
/** Detect free variable `module` */
25+
var freeModule = objectTypes[typeof module] && module && !module.nodeType && module;
26+
27+
/** Detect free variable `global` from Node.js or Browserified code and use it as `root` */
28+
var freeGlobal = freeExports && freeModule && objectTypes[typeof global] && global;
29+
if (freeGlobal && (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal || freeGlobal.self === freeGlobal)) {
2730
root = freeGlobal;
2831
}
2932

@@ -450,7 +453,7 @@
450453
// http://msdn.microsoft.com/en-us/library/ms537503(VS.85).aspx
451454
// http://web.archive.org/web/20081122053950/http://msdn.microsoft.com/en-us/library/ms537503(VS.85).aspx
452455
data = {
453-
'6.3': '8.1',
456+
'6.3': '8.1',
454457
'6.2': '8',
455458
'6.1': 'Server 2008 R2 / 7',
456459
'6.0': 'Server 2008 / Vista',
@@ -1017,8 +1020,8 @@
10171020
});
10181021
}
10191022
// check for `exports` after `define` in case a build optimizer adds an `exports` object
1020-
else if (freeExports && !freeExports.nodeType) {
1021-
// in Narwhal, Node.js, or RingoJS
1023+
else if (freeExports && freeModule) {
1024+
// in Narwhal, Node.js, RingoJS, or Rhino -require
10221025
forOwn(parse(), function(value, key) {
10231026
freeExports[key] = value;
10241027
});

vendor/qunit-extras/qunit-extras.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,11 @@
4444
/** Detect free variable `exports` */
4545
var freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && exports;
4646

47+
/** Detect free variable `module` */
48+
var freeModule = objectTypes[typeof module] && module && !module.nodeType && module;
49+
4750
/** Detect free variable `global` from Node.js or Browserified code and use it as `root` */
48-
var freeGlobal = objectTypes[typeof global] && global;
51+
var freeGlobal = freeExports && freeModule && objectTypes[typeof global] && global;
4952
if (freeGlobal && (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal || freeGlobal.self === freeGlobal)) {
5053
root = freeGlobal;
5154
}

0 commit comments

Comments
 (0)