Allow validate/reset only one scope model

hueitan · Jul 10, 2014 · e16c592 · e16c592
1 parent 343f578
commit e16c592
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 23 deletions.
diff --git a/dist/angular-validation.js b/dist/angular-validation.js
@@ -183,9 +183,13 @@
                     return deferred.promise;
                 }
 
-                for (var k in form) {
-                    if (form[k].hasOwnProperty('$dirty')) {
-                        $scope.$broadcast(k + 'submit-' + form[k].validationId, idx++);
+                if (form.validationId) {
+                    $scope.$broadcast(form.$name + 'submit-' + form.validationId, idx++);
+                } else {
+                    for (var k in form) {
+                        if (form[k] && form[k].hasOwnProperty('$dirty')) {
+                            $scope.$broadcast(k + 'submit-' + form[k].validationId, idx++);
+                        }
                     }
                 }
 
@@ -221,9 +225,19 @@
              * @param form
              */
             this.reset = function (form) {
-                for (var k in form) {
-                    if (form[k].hasOwnProperty('$dirty')) {
-                        $scope.$broadcast(k + 'reset-' + form[k].validationId);
+
+                if (form === undefined) {
+                    console.error('This is not a regular Form name scope');
+                    return;
+                }
+
+                if (form.validationId) {
+                    $scope.$broadcast(form.$name + 'reset-' + form.validationId);
+                } else {
+                    for (var k in form) {
+                        if (form[k].hasOwnProperty('$dirty')) {
+                            $scope.$broadcast(k + 'reset-' + form[k].validationId);
+                        }
                     }
                 }
             };
@@ -552,13 +566,13 @@
                 priority: 1, // execute before ng-click (0)
                 terminal: true,
                 link: function postLink(scope, element, attrs) {
-                    var form = attrs.validationSubmit;
+                    var form = $parse(attrs.validationSubmit)(scope);
 
                     $timeout(function () {
                         element.on('click', function (e) {
                             e.preventDefault();
 
-                            $validationProvider.validate(scope[form])
+                            $validationProvider.validate(form)
                                 .success(function () {
                                     $parse(attrs.ngClick)(scope);
                                 });
@@ -572,16 +586,17 @@
         .directive('validationReset', ['$injector', function ($injector) {
 
             var $validationProvider = $injector.get('$validation'),
-                $timeout = $injector.get('$timeout');
+                $timeout = $injector.get('$timeout'),
+                $parse = $injector.get('$parse');
 
             return {
                 link: function postLink(scope, element, attrs) {
-                    var form = attrs.validationReset;
+                    var form = $parse(attrs.validationReset)(scope);
 
                     $timeout(function () {
                         element.on('click', function (e) {
                             e.preventDefault();
-                            $validationProvider.reset(scope[form]);
+                            $validationProvider.reset(form);
                         });
                     });
 

diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
diff --git a/src/directive.js b/src/directive.js
@@ -295,13 +295,13 @@
                 priority: 1, // execute before ng-click (0)
                 terminal: true,
                 link: function postLink(scope, element, attrs) {
-                    var form = attrs.validationSubmit;
+                    var form = $parse(attrs.validationSubmit)(scope);
 
                     $timeout(function () {
                         element.on('click', function (e) {
                             e.preventDefault();
 
-                            $validationProvider.validate(scope[form])
+                            $validationProvider.validate(form)
                                 .success(function () {
                                     $parse(attrs.ngClick)(scope);
                                 });
@@ -315,16 +315,17 @@
         .directive('validationReset', ['$injector', function ($injector) {
 
             var $validationProvider = $injector.get('$validation'),
-                $timeout = $injector.get('$timeout');
+                $timeout = $injector.get('$timeout'),
+                $parse = $injector.get('$parse');
 
             return {
                 link: function postLink(scope, element, attrs) {
-                    var form = attrs.validationReset;
+                    var form = $parse(attrs.validationReset)(scope);
 
                     $timeout(function () {
                         element.on('click', function (e) {
                             e.preventDefault();
-                            $validationProvider.reset(scope[form]);
+                            $validationProvider.reset(form);
                         });
                     });
 

diff --git a/src/provider.js b/src/provider.js
@@ -180,9 +180,13 @@
                     return deferred.promise;
                 }
 
-                for (var k in form) {
-                    if (form[k].hasOwnProperty('$dirty')) {
-                        $scope.$broadcast(k + 'submit-' + form[k].validationId, idx++);
+                if (form.validationId) {
+                    $scope.$broadcast(form.$name + 'submit-' + form.validationId, idx++);
+                } else {
+                    for (var k in form) {
+                        if (form[k] && form[k].hasOwnProperty('$dirty')) {
+                            $scope.$broadcast(k + 'submit-' + form[k].validationId, idx++);
+                        }
                     }
                 }
 
@@ -218,9 +222,19 @@
              * @param form
              */
             this.reset = function (form) {
-                for (var k in form) {
-                    if (form[k].hasOwnProperty('$dirty')) {
-                        $scope.$broadcast(k + 'reset-' + form[k].validationId);
+
+                if (form === undefined) {
+                    console.error('This is not a regular Form name scope');
+                    return;
+                }
+
+                if (form.validationId) {
+                    $scope.$broadcast(form.$name + 'reset-' + form.validationId);
+                } else {
+                    for (var k in form) {
+                        if (form[k].hasOwnProperty('$dirty')) {
+                            $scope.$broadcast(k + 'reset-' + form[k].validationId);
+                        }
                     }
                 }
             };