🎨 re-arrange validation script

punchcard-cms · Sep 13, 2016 · b7b0fcc · b7b0fcc
1 parent 349f54b
commit b7b0fcc
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/validation.js b/lib/validation.js
@@ -21,13 +21,15 @@
 const isMobilePhone = require('validator/lib/isMobilePhone');
 
 module.exports = function telephoneValidation(input, settings) {
-  const set = settings;
+  // disable eslint for var because this is a browser-bound script
+  var locale = 'en-US'; // eslint-disable-line no-var
 
-  if (!set.hasOwnProperty('target') || !set.target.hasOwnProperty('locale') || set.target.locale === '') {
-    set.target.locale = 'en-US';
+  // check settings for locale
+  if (settings.hasOwnProperty('target') && settings.target.hasOwnProperty('locale') && settings.target.locale !== '' && typeof settings.target.locale === 'string') {
+    locale = settings.target.locale;
   }
 
-  if (input.target.value && !isMobilePhone(input.target.value, set.target.locale)) {
+  if (input.target.value && !isMobilePhone(input.target.value, locale)) {
     return `${input.target.name} must be a phone number`;
   }