Using $submitted of formController. close #3

Author: sagrawal31

dist/bootstrap-angular-validation.min.js

@@ -51,21 +51,11 @@ angular.module("bootstrap.angular.validation").directive("form", ["$parse", "$ro
             var preLinkFunction = function($scope, formElement, $attr, formController) {
                 // Expose a method to manually trigger the validation
                 formController.$validate = function() {
-                    $scope.formSubmissionAttempted = true;
+                    formController.$setSubmitted();
                 };
 
                 formElement.on("submit", function(e) {
-                    $scope.$apply(function() {
-                        /*
-                         * Notify all "bs-validation" directive that user has tried submitting the form, now we can
-                         * display validation error messages (if any). This is required, since if we immediately
-                         * starts displaying the validation error messages as the form displayed or as the user starts
-                         * typing, that will not a good user experience.
-                         */
-                        $scope.formSubmissionAttempted = true;
-                    });
-
-                    // If any of the form element does not pass the validation
+                    // If any of the form element has not passed the validation
                     if (formController.$invalid) {
                         // Then focus the first invalid element
                         formElement[0].querySelector(".ng-invalid").focus();
@@ -76,7 +66,7 @@ angular.module("bootstrap.angular.validation").directive("form", ["$parse", "$ro
                     var submitHandler = $parse(ngSubmit);
                     $scope.$apply(function() {
                         submitHandler($scope, {$event: e});
-                        $scope.formSubmissionAttempted = false;
+                        formController.$setPristine();
                     });
 
                     return true;

src/directives/form.directive.js

@@ -26,8 +26,11 @@
 angular.module("bootstrap.angular.validation").directive("bsValidation", ["$interpolate", "BsValidationService", function($interpolate, bsValidationService) {
     return {
         restrict: "A",
-        require: "ngModel",
-        link: function($scope, $element, $attr, ngModelController) {
+        require: ["ngModel", "^^form"],
+        link: function($scope, $element, $attr, controllers) {
+            var ngModelController = controllers[0];
+            var ngFormController = controllers[1];
+
             var errorElementClass = "bs-invalid-msg";
             // All classed needed to add to validation message
             var errorClasses = [errorElementClass, "help-block"];
@@ -74,7 +77,7 @@ angular.module("bootstrap.angular.validation").directive("bsValidation", ["$inte
                  * Do not show or hide error for current element don't have any validation errors or has validation
                  * error but user has not attempted to submit the form yet.
                  */
-                if (!$scope.formSubmissionAttempted || !ngModelController.$invalid) {
+                if (!ngFormController.$submitted || !ngModelController.$invalid || ngModelController.$pristine) {
                     formGroupElement.removeClass("has-error");
 
                     if (formGroupElement.length > 0) {
@@ -133,7 +136,7 @@ angular.module("bootstrap.angular.validation").directive("bsValidation", ["$inte
 
             // Look when user try to submit the form & display validation errors.
             $scope.$watchCollection(function() {
-                return $scope.formSubmissionAttempted && ngModelController.$error;
+                return ngFormController.$submitted && ngModelController.$error;
             }, displayOrHideError);
         }
     };