Fix server-side detection, closes #494

validatorjs · Feb 10, 2016 · 06e2080 · 06e2080
1 parent 05b5b8c
commit 06e2080
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@
   ([#489](https://github.com/chriso/validator.js/pull/489))
 - Reject IPv4 addresses with invalid zero padding
   ([#490](https://github.com/chriso/validator.js/pull/490))
+- Fix the client-side version when used with RequireJS
+  ([#494](https://github.com/chriso/validator.js/issues/494))
 
 #### 4.7.1
 

diff --git a/validator.js b/validator.js
@@ -144,17 +144,25 @@
     validator.init = function () {
         for (var name in validator) {
             if (typeof validator[name] !== 'function' || name === 'toString' ||
-                    name === 'toDate' || name === 'extend' || name === 'init') {
+                    name === 'toDate' || name === 'extend' || name === 'init' ||
+                    name === 'isServerSide') {
                 continue;
             }
             validator.extend(name, validator[name]);
         }
     };
 
+    validator.isServerSide = function () {
+        return typeof module === 'object' && module &&
+            typeof module.exports === 'object' &&
+            typeof process === 'object' &&
+            typeof require === 'function';
+    };
+
     var depd = null;
     validator.deprecation = function (msg) {
         if (depd === null) {
-            if (typeof require !== 'function') {
+            if (!validator.isServerSide()) {
                 return;
             }
             depd = require('depd')('validator');