Merge pull request #82 from tb/bootstrap-form-group

Huei Tan · Huei Tan · commit 6b22fe2065e9 · 2015-03-09T09:34:33.000+08:00
Toggle has-error on bootstrap form-group
diff --git a/README.md b/README.md
@@ -125,6 +125,19 @@ $validationProvider.setErrorHTML(function (msg) {
 
 You can add the bootstrap class `.has-success` in a similar fashion.
 
+To toggle `.has-error` class on bootstrap `.form-group` wrapper for labels and controls, add:
+
+```javascript
+angular.extend($validationProvider, {
+    validCallback: function (element){
+        $(element).parents('.form-group:first').removeClass('has-error');
+    },
+    invalidCallback: function (element) {
+        $(element).parents('.form-group:first').addClass('has-error');
+    }
+});
+```
+
 CHANGELOG
 =====
 See [release](https://github.com/huei90/angular-validation/releases)
diff --git a/dist/angular-validation.js b/dist/angular-validation.js
@@ -222,6 +222,17 @@
                 return deferred.promise;
             };
 
+            /**
+             * Do this function if validation valid
+             * @param element
+             */
+            this.validCallback = null;
+
+            /**
+             * Do this function if validation invalid
+             * @param element
+             */
+            this.invalidCallback = null;
 
             /**
              * reset the specific form
@@ -269,6 +280,8 @@
                         showErrorMessage: this.showErrorMessage,
                         checkValid: this.checkValid,
                         validate: this.validate,
+                        validCallback: this.validCallback,
+                        invalidCallback: this.invalidCallback,
                         reset: this.reset
                     };
                 }
@@ -312,6 +325,7 @@
                     }
                     ctrl.$setValidity(ctrl.$name, true);
                     if (scope.validCallback) scope.validCallback();
+                    if ($validationProvider.validCallback) $validationProvider.validCallback(element);
 
                     return true;
                 };
@@ -343,6 +357,7 @@
                     }
                     ctrl.$setValidity(ctrl.$name, false);
                     if (scope.inValidCallback) scope.inValidCallback();
+                    if ($validationProvider.invalidCallback) $validationProvider.invalidCallback(element);
 
                     return false;
                 };
diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
diff --git a/src/directive.js b/src/directive.js
@@ -33,6 +33,7 @@
                     }
                     ctrl.$setValidity(ctrl.$name, true);
                     if (scope.validCallback) scope.validCallback();
+                    if ($validationProvider.validCallback) $validationProvider.validCallback(element);
 
                     return true;
                 };
@@ -64,6 +65,7 @@
                     }
                     ctrl.$setValidity(ctrl.$name, false);
                     if (scope.inValidCallback) scope.inValidCallback();
+                    if ($validationProvider.invalidCallback) $validationProvider.invalidCallback(element);
 
                     return false;
                 };
diff --git a/src/provider.js b/src/provider.js
@@ -218,6 +218,17 @@
                 return deferred.promise;
             };
 
+            /**
+             * Do this function if validation valid
+             * @param element
+             */
+            this.validCallback = null;
+
+            /**
+             * Do this function if validation invalid
+             * @param element
+             */
+            this.invalidCallback = null;
 
             /**
              * reset the specific form
@@ -265,6 +276,8 @@
                         showErrorMessage: this.showErrorMessage,
                         checkValid: this.checkValid,
                         validate: this.validate,
+                        validCallback: this.validCallback,
+                        invalidCallback: this.invalidCallback,
                         reset: this.reset
                     };
                 }

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`}`
`34`	`34`	`ctrl.$setValidity(ctrl.$name, true);`
`35`	`35`	`if (scope.validCallback) scope.validCallback();`
	`36`	`+ if ($validationProvider.validCallback) $validationProvider.validCallback(element);`
`36`	`37`
`37`	`38`	`return true;`
`38`	`39`	`};`
`@@ -64,6 +65,7 @@`
`64`	`65`	`}`
`65`	`66`	`ctrl.$setValidity(ctrl.$name, false);`
`66`	`67`	`if (scope.inValidCallback) scope.inValidCallback();`
	`68`	`+ if ($validationProvider.invalidCallback) $validationProvider.invalidCallback(element);`
`67`	`69`
`68`	`70`	`return false;`
`69`	`71`	`};`