Use peek to check the existing rules

It prevents any encapsulating subscriptions to fire if the rules change. Closes #595
Knockout-Contrib · Dec 8, 2015 · 4e38dfa · 4e38dfa
1 parent 8745eb1
commit 4e38dfa
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/dist/knockout.validation-with-locales.js b/dist/knockout.validation-with-locales.js
@@ -466,11 +466,12 @@ kv.configuration = configuration;
 		//
 		addRule: function (observable, rule) {
 			observable.extend({ validatable: true });
-
-			var hasRule = !!koUtils.arrayFirst(observable.rules(), function(item) {
+			//calculate if the observable already has this rule
+			//peek the set of rules so this function does not cause any encapsulating subsciptions to fire if the rules change
+			var hasRule = !!koUtils.arrayFirst(observable.rules.peek(), function(item) {
 				return item.rule && item.rule === rule.rule;
 			});
-
+			//do not add the rule if it already exists on the observable
 			if (!hasRule) {
 				//push a Rule Context to the observables local array of Rule Contexts
 				observable.rules.push(rule);

diff --git a/dist/knockout.validation-with-locales.min.js b/dist/knockout.validation-with-locales.min.js
diff --git a/dist/knockout.validation-with-locales.min.js.map b/dist/knockout.validation-with-locales.min.js.map
diff --git a/dist/knockout.validation.js b/dist/knockout.validation.js
@@ -466,11 +466,12 @@ kv.configuration = configuration;
 		//
 		addRule: function (observable, rule) {
 			observable.extend({ validatable: true });
-
-			var hasRule = !!koUtils.arrayFirst(observable.rules(), function(item) {
+			//calculate if the observable already has this rule
+			//peek the set of rules so this function does not cause any encapsulating subsciptions to fire if the rules change
+			var hasRule = !!koUtils.arrayFirst(observable.rules.peek(), function(item) {
 				return item.rule && item.rule === rule.rule;
 			});
-
+			//do not add the rule if it already exists on the observable
 			if (!hasRule) {
 				//push a Rule Context to the observables local array of Rule Contexts
 				observable.rules.push(rule);

diff --git a/dist/knockout.validation.min.js b/dist/knockout.validation.min.js
diff --git a/dist/knockout.validation.min.js.map b/dist/knockout.validation.min.js.map
diff --git a/src/api.js b/src/api.js
@@ -268,11 +268,12 @@
 		//
 		addRule: function (observable, rule) {
 			observable.extend({ validatable: true });
-
-			var hasRule = !!ko.utils.arrayFirst(observable.rules(), function(item) {
+			//calculate if the observable already has this rule
+			//peek the set of rules so this function does not cause any encapsulating subsciptions to fire if the rules change
+			var hasRule = !!ko.utils.arrayFirst(observable.rules.peek(), function(item) {
 				return item.rule && item.rule === rule.rule;
 			});
-
+			//do not add the rule if it already exists on the observable
 			if (!hasRule) {
 				//push a Rule Context to the observables local array of Rule Contexts
 				observable.rules.push(rule);