unique field event #22

Thanks @gilad1987
hueitan · Jun 15, 2014 · af5ea19 · af5ea19
1 parent 23b5bbe
commit af5ea19
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 9 deletions.
diff --git a/dist/angular-validation.js b/dist/angular-validation.js
@@ -190,7 +190,7 @@
 
                 for (var k in form) {
                     if (form[k].hasOwnProperty('$dirty')) {
-                        $scope.$broadcast(k + 'submit', idx++);
+                        $scope.$broadcast(k + 'submit-' + form[k].validationId, idx++);
                     }
                 }
 
@@ -229,7 +229,7 @@
             this.reset = function (form) {
                 for (var k in form) {
                     if (form[k].hasOwnProperty('$dirty')) {
-                        $scope.$broadcast(k + 'reset');
+                        $scope.$broadcast(k + 'reset-' + form[k].validationId);
                     }
                 }
             };
@@ -366,6 +366,17 @@
             };
 
 
+            /**
+             * generate unique guid
+             */
+            var s4 = function () {
+                return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+            };
+            var guid = function () {
+                return (s4() + s4() + s4() + s4());
+            };
+
+
             return {
                 restrict: 'A',
                 require: 'ngModel',
@@ -394,6 +405,11 @@
                      */
                     var validator = attrs.validator.split(',');
 
+                    /**
+                     * guid use
+                     */
+                    var uid = ctrl.validationId = guid();
+
                     /**
                      * Valid/Invalid Message
                      */
@@ -407,7 +423,7 @@
                     /**
                      * Reset the validation for specific form
                      */
-                    scope.$on(ctrl.$name + 'reset', function () {
+                    scope.$on(ctrl.$name + 'reset-' + uid, function () {
 
                         /**
                          * clear scope.$watch here
@@ -433,7 +449,7 @@
                         /**
                          * Click submit form, check the validity when submit
                          */
-                        scope.$on(ctrl.$name + 'submit', function (event, index) {
+                        scope.$on(ctrl.$name + 'submit-' + uid, function (event, index) {
                             var value = element[0].value,
                                 isValid = false;
 

diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
diff --git a/index.html b/index.html
@@ -29,6 +29,7 @@ <h1>Angular Validation.
 <div class="row">
     <div class="small-12 medium-12 large-6 columns">
         <form name="Form" id="form1">
+            {{ Form }}
             <fieldset>
                 <legend>Form ($watch)</legend>
 

diff --git a/src/directive.js b/src/directive.js
@@ -103,6 +103,17 @@
             };
 
 
+            /**
+             * generate unique guid
+             */
+            var s4 = function () {
+                return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+            };
+            var guid = function () {
+                return (s4() + s4() + s4() + s4());
+            };
+
+
             return {
                 restrict: 'A',
                 require: 'ngModel',
@@ -131,6 +142,11 @@
                      */
                     var validator = attrs.validator.split(',');
 
+                    /**
+                     * guid use
+                     */
+                    var uid = ctrl.validationId = guid();
+
                     /**
                      * Valid/Invalid Message
                      */
@@ -144,7 +160,7 @@
                     /**
                      * Reset the validation for specific form
                      */
-                    scope.$on(ctrl.$name + 'reset', function () {
+                    scope.$on(ctrl.$name + 'reset-' + uid, function () {
 
                         /**
                          * clear scope.$watch here
@@ -170,7 +186,7 @@
                         /**
                          * Click submit form, check the validity when submit
                          */
-                        scope.$on(ctrl.$name + 'submit', function (event, index) {
+                        scope.$on(ctrl.$name + 'submit-' + uid, function (event, index) {
                             var value = element[0].value,
                                 isValid = false;
 

diff --git a/src/provider.js b/src/provider.js
@@ -187,7 +187,7 @@
 
                 for (var k in form) {
                     if (form[k].hasOwnProperty('$dirty')) {
-                        $scope.$broadcast(k + 'submit', idx++);
+                        $scope.$broadcast(k + 'submit-' + form[k].validationId, idx++);
                     }
                 }
 
@@ -226,7 +226,7 @@
             this.reset = function (form) {
                 for (var k in form) {
                     if (form[k].hasOwnProperty('$dirty')) {
-                        $scope.$broadcast(k + 'reset');
+                        $scope.$broadcast(k + 'reset-' + form[k].validationId);
                     }
                 }
             };