Merge pull request #26 from eyeview-opensource/master

Support ng-repeat and ng-if.
Jakobovski · Mar 8, 2015 · 3690ac0 · 3690ac0
2 parents e0ffaa5 + 69e7ed7
commit 3690ac0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/dist/angular-validator.js b/dist/angular-validator.js
@@ -33,6 +33,11 @@ angular.module('angularValidator').directive('angularValidator',
                     }
                 });
 
+                // Watch form length to add watches into new form elements
+                scope.$watch(function(){return DOMForm.length;}, function(){
+                    setupWatches(DOMForm);
+                });
+
                 // Setup watches on all form fields 
                 setupWatches(DOMForm);
 
@@ -51,6 +56,12 @@ angular.module('angularValidator').directive('angularValidator',
                 // Setup $watch on a single formfield
                 function setupWatch(elementToWatch) {
 
+                    //Prevent to re-watch the element
+                    if (elementToWatch.isWatchedByValidator){
+                        return;
+                    }
+                    elementToWatch.isWatchedByValidator = true;
+
                     // If element is set to validate on blur then update the element on blur
                     if ("validate-on" in elementToWatch.attributes && elementToWatch.attributes["validate-on"].value === "blur") {
                         angular.element(elementToWatch).on('blur', function() {

diff --git a/dist/angular-validator.min.js b/dist/angular-validator.min.js
diff --git a/src/angular-validator.js b/src/angular-validator.js
@@ -33,6 +33,11 @@ angular.module('angularValidator').directive('angularValidator',
                     }
                 });
 
+                // Watch form length to add watches into new form elements
+                scope.$watch(function(){return DOMForm.length;}, function(){
+                    setupWatches(DOMForm);
+                });
+
                 // Setup watches on all form fields 
                 setupWatches(DOMForm);
 
@@ -51,6 +56,12 @@ angular.module('angularValidator').directive('angularValidator',
                 // Setup $watch on a single formfield
                 function setupWatch(elementToWatch) {
 
+                    //Prevent to re-watch the element
+                    if (elementToWatch.isWatchedByValidator){
+                        return;
+                    }
+                    elementToWatch.isWatchedByValidator = true;
+
                     // If element is set to validate on blur then update the element on blur
                     if ("validate-on" in elementToWatch.attributes && elementToWatch.attributes["validate-on"].value === "blur") {
                         angular.element(elementToWatch).on('blur', function() {