Update freeGlobal assignment in lodash builds, benchmark.js, and qu…

…nit-extras to work in node-webkit. [closes #419]
lodash · Jan 26, 2014 · e76685f · e76685f
1 parent 8fabcf3
commit e76685f
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 28 deletions.
diff --git a/dist/lodash.compat.js b/dist/lodash.compat.js
@@ -188,15 +188,15 @@
   /** Detect free variable `exports` */
   var freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && exports;
 
+  /** Detect free variable `module` */
+  var freeModule = objectTypes[typeof module] && module && !module.nodeType && module;
+
   /** Detect free variable `global` from Node.js or Browserified code and use it as `root` */
-  var freeGlobal = objectTypes[typeof global] && global;
+  var freeGlobal = freeExports && freeModule && objectTypes[typeof global] && global;
   if (freeGlobal && (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal || freeGlobal.self === freeGlobal)) {
     root = freeGlobal;
   }
 
-  /** Detect free variable `module` */
-  var freeModule = objectTypes[typeof module] && module && !module.nodeType && module;
-
   /** Detect the popular CommonJS extension `module.exports` */
   var moduleExports = freeModule && freeModule.exports === freeExports && freeExports;
 

diff --git a/dist/lodash.compat.min.js b/dist/lodash.compat.min.js
diff --git a/dist/lodash.js b/dist/lodash.js
@@ -181,15 +181,15 @@
   /** Detect free variable `exports` */
   var freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && exports;
 
+  /** Detect free variable `module` */
+  var freeModule = objectTypes[typeof module] && module && !module.nodeType && module;
+
   /** Detect free variable `global` from Node.js or Browserified code and use it as `root` */
-  var freeGlobal = objectTypes[typeof global] && global;
+  var freeGlobal = freeExports && freeModule && objectTypes[typeof global] && global;
   if (freeGlobal && (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal || freeGlobal.self === freeGlobal)) {
     root = freeGlobal;
   }
 
-  /** Detect free variable `module` */
-  var freeModule = objectTypes[typeof module] && module && !module.nodeType && module;
-
   /** Detect the popular CommonJS extension `module.exports` */
   var moduleExports = freeModule && freeModule.exports === freeExports && freeExports;
 

diff --git a/dist/lodash.min.js b/dist/lodash.min.js
diff --git a/dist/lodash.underscore.js b/dist/lodash.underscore.js
@@ -106,15 +106,15 @@
   /** Detect free variable `exports` */
   var freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && exports;
 
+  /** Detect free variable `module` */
+  var freeModule = objectTypes[typeof module] && module && !module.nodeType && module;
+
   /** Detect free variable `global` from Node.js or Browserified code and use it as `root` */
-  var freeGlobal = objectTypes[typeof global] && global;
+  var freeGlobal = freeExports && freeModule && objectTypes[typeof global] && global;
   if (freeGlobal && (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal || freeGlobal.self === freeGlobal)) {
     root = freeGlobal;
   }
 
-  /** Detect free variable `module` */
-  var freeModule = objectTypes[typeof module] && module && !module.nodeType && module;
-
   /** Detect the popular CommonJS extension `module.exports` */
   var moduleExports = freeModule && freeModule.exports === freeExports && freeExports;