Merge pull request #267 from ezsystems/EZP-28646-fix-map-validation

EZP-28646: Validation alert for map location which is not required
ezsystems · Dec 21, 2017 · 41ec736 · 41ec736
2 parents e3597cf + f3877f9
commit 41ec736
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezgmaplocation.js b/src/bundle/Resources/public/js/scripts/fieldType/ezgmaplocation.js
@@ -19,13 +19,13 @@
             const result = { isError: false };
             const label = input.closest('.ez-data-source__field').querySelector('.ez-data-source__label').innerHTML;
             const isNumber = !isNaN(value);
-            const isCorrectValue = isNumber && (value <= max && value >= min);
+            const isInRange = (value <= max && value >= min);
 
-            if (!input.required && isCorrectValue) {
+            if (!input.required && isNumber && isInRange) {
                 return result;
             }
 
-            if (!isCorrectValue) {
+            if (isNumber && !isInRange) {
                 result.isError = true;
                 result.errorMessage = window.eZ.errors.outOfRangeValue
                     .replace('{fieldName}', label)
@@ -35,7 +35,7 @@
                 return result;
             }
 
-            if (isNaN(value)) {
+            if (input.required && !isNumber) {
                 result.isError = true;
                 result.errorMessage = window.eZ.errors.emptyField.replace('{fieldName}', label);
             }