Fix scope.$on('submit') order

Don't watch when init This order is better than using return;
hueitan · Apr 14, 2014 · 8e594cf · 8e594cf
1 parent a08264c
commit 8e594cf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/dist/angular-validation.js b/dist/angular-validation.js
@@ -417,10 +417,16 @@
                         scope.$on(ctrl.$name + 'submit', function () {
                             var value = element[0].value;
 
-                            if (attrs.validMethod === 'submit') {
+                            checkValidation(scope, element, attrs, ctrl, validation, value);
 
+                            if (attrs.validMethod === 'submit') {
                                 watch(); // clear previous scope.$watch
-                                watch = scope.$watch('model', function (value) {
+                                watch = scope.$watch('model', function (value, oldValue) {
+
+                                    // don't watch when init
+                                    if (value === oldValue) {
+                                        return;
+                                    }
 
                                     // scope.$watch will translate '' to undefined
                                     // undefined/null will pass the required submit /^.+/
@@ -432,10 +438,8 @@
                                     checkValidation(scope, element, attrs, ctrl, validation, value);
                                 });
 
-                                return;
                             }
 
-                            checkValidation(scope, element, attrs, ctrl, validation, value);
                         });
 
                         /**

diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
diff --git a/src/directive.js b/src/directive.js
@@ -160,10 +160,16 @@
                         scope.$on(ctrl.$name + 'submit', function () {
                             var value = element[0].value;
 
-                            if (attrs.validMethod === 'submit') {
+                            checkValidation(scope, element, attrs, ctrl, validation, value);
 
+                            if (attrs.validMethod === 'submit') {
                                 watch(); // clear previous scope.$watch
-                                watch = scope.$watch('model', function (value) {
+                                watch = scope.$watch('model', function (value, oldValue) {
+
+                                    // don't watch when init
+                                    if (value === oldValue) {
+                                        return;
+                                    }
 
                                     // scope.$watch will translate '' to undefined
                                     // undefined/null will pass the required submit /^.+/
@@ -175,10 +181,8 @@
                                     checkValidation(scope, element, attrs, ctrl, validation, value);
                                 });
 
-                                return;
                             }
 
-                            checkValidation(scope, element, attrs, ctrl, validation, value);
                         });
 
                         /**