Merge pull request #80 from inicolenco/iss60

Fixed issue #60
nelsonomuto · Sep 12, 2016 · bac6e0b · bac6e0b
2 parents 4d85773 + e881d1d
commit bac6e0b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/scripts/directives/customvalidation/customValidations.js b/app/scripts/directives/customvalidation/customValidations.js
@@ -495,10 +495,12 @@ angular_ui_form_validations = (function(){
                         }
                     }
 
+                    value = getElementValue();
+
                     //Do not validate if input is pristine, i.e nothing entered by user yet
                     if($element.hasClass('ng-pristine') && eventType !=='runCustomValidations'){
                         console.log('--- runCustomValidations not validating because pristine');
-                        return;
+                        return value;
                     }
 
                     successFn = formatterArgs.success || function(){};
@@ -596,7 +598,6 @@ angular_ui_form_validations = (function(){
 
                     currentlyDisplayingAnErrorMessage = currentErrorMessage.length > 0;
 
-                    value = getElementValue();
 
                     if (formatterArgs.customValidationAttribute === 'validationFieldRequired') {
                         toggleRequiredLabelClass();