forceValidation and forceValidationIfPopulated

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-auto-validate",
-  "version": "1.19.6",
+  "version": "1.19.7",
   "description": "An automatic validation module for AngularJS which gets rid of excess html in favour of dynamic element modification to notify the user of validation errors",
   "main": "dist/jcs-auto-validate.js",
   "keywords": [
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/jonsamwell/angular-auto-validate",
   "repository": {
     "type": "git",
-    "url": "git://github.com/jonsamwell/angular-auto-validate"
+    "url": "git://github.com/timWardYrcFreight/angular-auto-validate"
   },
   "ignore": [
     "**/.*",

dist/jcs-auto-validate.js

@@ -1,5 +1,5 @@
 /*
- * angular-auto-validate - v1.19.6 - 2016-06-17
+ * angular-auto-validate - v1.19.6 - 2016-10-17
  * https://github.com/jonsamwell/angular-auto-validate
  * Copyright (c) 2016 Jon Samwell (http://www.jonsamwell.com)
  */
@@ -338,6 +338,7 @@ function ValidatorFn() {
 
   this.defaultFormValidationOptions = {
     forceValidation: false,
+    forceValidationIfPopulated: false,
     disabled: false,
     validateNonVisibleControls: false,
     removeExternalValidationErrorsOnSubmit: true,
@@ -1087,7 +1088,7 @@ function ValidationManagerFn(validator, elementUtils, $anchorScroll) {
     validateElement = function (modelCtrl, el, options) {
       var isValid = true,
         frmOptions = options || getFormOptions(el),
-        needsValidation = modelCtrl.$pristine === false || frmOptions.forceValidation,
+        needsValidation = modelCtrl.$pristine === false || frmOptions.forceValidation || (frmOptions.forceValidationIfPopulated && modelCtrl.$viewValue !== undefined && modelCtrl.$viewValue !== ""),
         errorType,
         findErrorType = function ($errors) {
           var keepGoing = true,
@@ -1277,7 +1278,8 @@ function parseOptions(ctrl, validator, attrs) {
     return ctrl;
   };
   opts.waitForAsyncValidators = parseBooleanAttributeValue(attrs.waitForAsyncValidators, opts.waitForAsyncValidators);
-  opts.forceValidation = false;
+  opts.forceValidation = parseBooleanAttributeValue(attrs.forceValidation, opts.forceValidation);
+  opts.forceValidationIfPopulated = parseBooleanAttributeValue(attrs.forceValidationIfPopulated, opts.forceValidationIfPopulated);
   opts.disabled = !validator.isEnabled() || parseBooleanAttributeValue(attrs.disableDynamicValidation, opts.disabled);
   opts.validateNonVisibleControls = parseBooleanAttributeValue(attrs.validateNonVisibleControls, opts.validateNonVisibleControls);
   opts.validateOnFormSubmit = parseBooleanAttributeValue(attrs.validateOnFormSubmit, opts.validateOnFormSubmit);

package.json

@@ -1,14 +1,14 @@
 {
   "name": "angular-auto-validate",
-  "version": "1.19.6",
+  "version": "1.19.7",
   "description": "An automatic validation module for AngularJS which gets rid of excess html in favour of dynamic element modification to notify the user of validation errors",
   "main": "dist/jcs-auto-validate.min.js",
   "scripts": {
     "test": "default"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/jonsamwell/angular-auto-validate.git"
+    "url": "https://github.com/timWardYrcFreight/angular-auto-validate.git"
   },
   "keywords": [
     "angularjs",

src/directives/autoValidateFormOptions.js

@@ -14,7 +14,8 @@ function parseOptions(ctrl, validator, attrs) {
     return ctrl;
   };
   opts.waitForAsyncValidators = parseBooleanAttributeValue(attrs.waitForAsyncValidators, opts.waitForAsyncValidators);
-  opts.forceValidation = false;
+  opts.forceValidation = parseBooleanAttributeValue(attrs.forceValidation, opts.forceValidation);
+  opts.forceValidationIfPopulated = parseBooleanAttributeValue(attrs.forceValidationIfPopulated, opts.forceValidationIfPopulated);
   opts.disabled = !validator.isEnabled() || parseBooleanAttributeValue(attrs.disableDynamicValidation, opts.disabled);
   opts.validateNonVisibleControls = parseBooleanAttributeValue(attrs.validateNonVisibleControls, opts.validateNonVisibleControls);
   opts.validateOnFormSubmit = parseBooleanAttributeValue(attrs.validateOnFormSubmit, opts.validateOnFormSubmit);

src/providers/validator.js

@@ -328,6 +328,7 @@ function ValidatorFn() {
 
   this.defaultFormValidationOptions = {
     forceValidation: false,
+    forceValidationIfPopulated: false,
     disabled: false,
     validateNonVisibleControls: false,
     removeExternalValidationErrorsOnSubmit: true,

src/services/validationManager.js

@@ -74,7 +74,7 @@ function ValidationManagerFn(validator, elementUtils, $anchorScroll) {
     validateElement = function (modelCtrl, el, options) {
       var isValid = true,
         frmOptions = options || getFormOptions(el),
-        needsValidation = modelCtrl.$pristine === false || frmOptions.forceValidation,
+        needsValidation = modelCtrl.$pristine === false || frmOptions.forceValidation || (frmOptions.forceValidationIfPopulated && modelCtrl.$viewValue !== undefined && modelCtrl.$viewValue !== ""),
         errorType,
         findErrorType = function ($errors) {
           var keepGoing = true,

tests/services/validationManager.spec.js

@@ -22,6 +22,7 @@
         var internalFormController = {};
         return {
           forceValidation: false,
+          forceValidationIfPopulated: false,
           disabled: false,
           validateNonVisibleControls: false,
           validateOnFormSubmit: false,