Fix validate.reset method

hueitan · Apr 13, 2014 · 0a96acb · 0a96acb
1 parent d863375
commit 0a96acb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/dist/angular-validation.js b/dist/angular-validation.js
@@ -223,10 +223,6 @@
             this.reset = function (form) {
                 for (var k in form) {
                     if (form[k].hasOwnProperty('$dirty')) {
-                        form[k].$setViewValue(null);
-                        form[k].$setPristine();
-                        form[k].$setValidity(form[k].$name, false);
-                        form[k].$render();
                         $scope.$broadcast(k + 'reset');
                     }
                 }
@@ -384,6 +380,10 @@
                      * Reset the validation for specific form
                      */
                     scope.$on(ctrl.$name + 'reset', function () {
+                        ctrl.$setViewValue(null);
+                        ctrl.$setPristine();
+                        ctrl.$setValidity(ctrl.$name, false);
+                        ctrl.$render();
                         element.next().html('');
                     });
 

diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
diff --git a/src/directive.js b/src/directive.js
@@ -123,6 +123,10 @@
                      * Reset the validation for specific form
                      */
                     scope.$on(ctrl.$name + 'reset', function () {
+                        ctrl.$setViewValue(null);
+                        ctrl.$setPristine();
+                        ctrl.$setValidity(ctrl.$name, false);
+                        ctrl.$render();
                         element.next().html('');
                     });
 

diff --git a/src/provider.js b/src/provider.js
@@ -220,10 +220,6 @@
             this.reset = function (form) {
                 for (var k in form) {
                     if (form[k].hasOwnProperty('$dirty')) {
-                        form[k].$setViewValue(null);
-                        form[k].$setPristine();
-                        form[k].$setValidity(form[k].$name, false);
-                        form[k].$render();
                         $scope.$broadcast(k + 'reset');
                     }
                 }