From: Tim Wood <washwithcare@gmail.com>
Date: Tue, 12 Jun 2012 17:27:18 +0000 (-0700)
Subject: More explicit NodeJS check to fix #314
X-Git-Tag: 1.7.0~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61eae9e9ba989b56f3c973600263f79c34838019;p=thirdparty%2Fmoment.git

More explicit NodeJS check to fix #314
---

diff --git a/lang/ca.js b/lang/ca.js
index d20708240..5eae6e789 100644
--- a/lang/ca.js
+++ b/lang/ca.js
@@ -54,7 +54,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/cv.js b/lang/cv.js
index 562be2308..a0598f47c 100644
--- a/lang/cv.js
+++ b/lang/cv.js
@@ -44,7 +44,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/da.js b/lang/da.js
index 77134e1e2..0c3c36c09 100644
--- a/lang/da.js
+++ b/lang/da.js
@@ -44,7 +44,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/de.js b/lang/de.js
index b31ef0ec0..bbe4e13d5 100644
--- a/lang/de.js
+++ b/lang/de.js
@@ -44,7 +44,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/en-gb.js b/lang/en-gb.js
index 36d468818..a01a7d04c 100644
--- a/lang/en-gb.js
+++ b/lang/en-gb.js
@@ -48,7 +48,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/es.js b/lang/es.js
index 5ffbc82b6..f093d1a96 100644
--- a/lang/es.js
+++ b/lang/es.js
@@ -54,7 +54,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/eu.js b/lang/eu.js
index 74f88cea8..79e224e42 100644
--- a/lang/eu.js
+++ b/lang/eu.js
@@ -44,7 +44,7 @@
         };
     
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/fi.js b/lang/fi.js
index 388ba0961..826259b3f 100644
--- a/lang/fi.js
+++ b/lang/fi.js
@@ -88,7 +88,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/fr.js b/lang/fr.js
index 840ecd682..819f48cd2 100644
--- a/lang/fr.js
+++ b/lang/fr.js
@@ -44,7 +44,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/gl.js b/lang/gl.js
index fafa17133..51c8569fb 100644
--- a/lang/gl.js
+++ b/lang/gl.js
@@ -54,7 +54,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/hu.js b/lang/hu.js
index 94b63e967..4745cbb59 100644
--- a/lang/hu.js
+++ b/lang/hu.js
@@ -97,7 +97,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
 
diff --git a/lang/is.js b/lang/is.js
index 3b81f363e..c845665ad 100644
--- a/lang/is.js
+++ b/lang/is.js
@@ -122,7 +122,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/it.js b/lang/it.js
index 3d778c9ac..fb113e04a 100644
--- a/lang/it.js
+++ b/lang/it.js
@@ -44,7 +44,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/jp.js b/lang/jp.js
index 1fc725134..e30f59988 100644
--- a/lang/jp.js
+++ b/lang/jp.js
@@ -51,7 +51,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/kr.js b/lang/kr.js
index c0781a504..48343d6a4 100644
--- a/lang/kr.js
+++ b/lang/kr.js
@@ -48,7 +48,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/nb.js b/lang/nb.js
index 330e65d59..dd0a266f8 100644
--- a/lang/nb.js
+++ b/lang/nb.js
@@ -44,7 +44,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/nl.js b/lang/nl.js
index 7670814ab..8ad8c9fbc 100644
--- a/lang/nl.js
+++ b/lang/nl.js
@@ -44,7 +44,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/pl.js b/lang/pl.js
index ecefde9bd..5c4193c57 100644
--- a/lang/pl.js
+++ b/lang/pl.js
@@ -66,7 +66,7 @@
     };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/pt.js b/lang/pt.js
index 987645c03..55eb54063 100644
--- a/lang/pt.js
+++ b/lang/pt.js
@@ -48,7 +48,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/ru.js b/lang/ru.js
index 811d2c4ec..b5d01840c 100644
--- a/lang/ru.js
+++ b/lang/ru.js
@@ -97,7 +97,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/sv.js b/lang/sv.js
index c8511098a..cb32ae8fd 100644
--- a/lang/sv.js
+++ b/lang/sv.js
@@ -48,7 +48,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/tr.js b/lang/tr.js
index 8960c7e9a..84c04ad6f 100644
--- a/lang/tr.js
+++ b/lang/tr.js
@@ -48,7 +48,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/zh-cn.js b/lang/zh-cn.js
index 7ff88a19f..0dd1ebb2b 100644
--- a/lang/zh-cn.js
+++ b/lang/zh-cn.js
@@ -52,12 +52,12 @@
                 yy : "%då¹´"
             },
             ordinal : function (number) {
-                    return '';
+                return '';
             }
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/lang/zh-tw.js b/lang/zh-tw.js
index b7e1ff980..0938718aa 100644
--- a/lang/zh-tw.js
+++ b/lang/zh-tw.js
@@ -57,7 +57,7 @@
         };
 
     // Node
-    if (typeof module !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
         module.exports = lang;
     }
     // Browser
diff --git a/moment.js b/moment.js
index 7a65c537e..502aaf72b 100644
--- a/moment.js
+++ b/moment.js
@@ -18,7 +18,7 @@
         currentLanguage = 'en',
 
         // check for nodeJS
-        hasModule = (typeof module !== 'undefined'),
+        hasModule = (typeof module !== 'undefined' && module.exports),
 
         // Parameters to check for on the lang config.  This list of properties
         // will be inherited from English if not provided in a language