Don't use Object.values, fixes #681

validatorjs · Aug 22, 2017 · c2ad3a1 · c2ad3a1
1 parent b3e45da
commit c2ad3a1
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,10 @@
   ([#688](https://github.com/chriso/validator.js/issues/688))
 - Allow comma in email display names
   ([#692](https://github.com/chriso/validator.js/pull/692))
-- Add missing string to unescape
+- Add missing string to `unescape()`
   ([#690](https://github.com/chriso/validator.js/pull/690))
+- Fix `isMobilePhone()` with Node <= 6.x
+  ([#681](https://github.com/chriso/validator.js/issues/681))
 - New locales
   ([#692](https://github.com/chriso/validator.js/pull/692))
 

diff --git a/lib/isMobilePhone.js b/lib/isMobilePhone.js
@@ -72,9 +72,15 @@ function isMobilePhone(str, locale) {
   if (locale in phones) {
     return phones[locale].test(str);
   } else if (locale === 'any') {
-    return !!Object.values(phones).find(function (phone) {
-      return phone.test(str);
-    });
+    for (var key in phones) {
+      if (phones.hasOwnProperty(key)) {
+        var phone = phones[key];
+        if (phone.test(str)) {
+          return true;
+        }
+      }
+    }
+    return false;
   }
   throw new Error('Invalid locale \'' + locale + '\'');
 }

diff --git a/src/lib/isMobilePhone.js b/src/lib/isMobilePhone.js
@@ -61,7 +61,15 @@ export default function isMobilePhone(str, locale) {
   if (locale in phones) {
     return phones[locale].test(str);
   } else if (locale === 'any') {
-    return !!Object.values(phones).find(phone => phone.test(str));
+    for (const key in phones) {
+      if (phones.hasOwnProperty(key)) {
+        const phone = phones[key];
+        if (phone.test(str)) {
+          return true;
+        }
+      }
+    }
+    return false;
   }
   throw new Error(`Invalid locale '${locale}'`);
 }
diff --git a/validator.js b/validator.js
@@ -955,9 +955,15 @@ function isMobilePhone(str, locale) {
   if (locale in phones) {
     return phones[locale].test(str);
   } else if (locale === 'any') {
-    return !!Object.values(phones).find(function (phone) {
-      return phone.test(str);
-    });
+    for (var key in phones) {
+      if (phones.hasOwnProperty(key)) {
+        var phone = phones[key];
+        if (phone.test(str)) {
+          return true;
+        }
+      }
+    }
+    return false;
   }
   throw new Error('Invalid locale \'' + locale + '\'');
 }