Merge pull request Knockout-Contrib#529 from askheaves/master

validationElement and validationMessage bindings throw if observable is not validatable.
EikosPartners · Jan 30, 2015 · d0a16f7 · d0a16f7
2 parents ace59f8 + 8409e9a
commit d0a16f7
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 26 deletions.
diff --git a/dist/knockout.validation.js b/dist/knockout.validation.js
@@ -1062,12 +1062,8 @@ ko.bindingHandlers['validationMessage'] = { // individual error message, if modi
 				element.getAttribute('data-bind'));
 		}
 
-		if (!obsv.isValid || !obsv.isModified) {
-			throw new Error("Observable is not validatable");
-		}
-
-		isModified = obsv.isModified();
-		isValid = obsv.isValid();
+		isModified = obsv.isModified && obsv.isModified();
+		isValid = obsv.isValid && obsv.isValid();
 
 		var error = null;
 		if (!config.messagesOnModified || isModified) {
@@ -1105,12 +1101,8 @@ ko.bindingHandlers['validationElement'] = {
 				element.getAttribute('data-bind'));
 		}
 
-		if (!obsv.isValid || !obsv.isModified) {
-			throw new Error("Observable is not validatable");
-		}
-
-		isModified = obsv.isModified();
-		isValid = obsv.isValid();
+		isModified = obsv.isModified && obsv.isModified();
+		isValid = obsv.isValid && obsv.isValid();
 
 		// create an evaluator function that will return something like:
 		// css: { validationElement: true }

diff --git a/dist/knockout.validation.min.js b/dist/knockout.validation.min.js