Allow validation params in object without custom message and without …

…onlyIf Closes #554 Closes #561
Knockout-Contrib · Aug 22, 2018 · 8e0846e · 8e0846e
1 parent e0b8985
commit 8e0846e
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 7 deletions.
diff --git a/dist/knockout.validation-with-locales.js b/dist/knockout.validation-with-locales.js
@@ -524,7 +524,8 @@ kv.configuration = configuration;
 				//	  }
 				//  )};
 				//
-				if (params && (params.message || params.onlyIf)) { //if it has a message or condition object, then its an object literal to use
+				//if it has an embedded params, a message or condition object, then it's an object literal to use
+				if (params && (params.params || params.message || params.onlyIf)) {
 					return kv.addRule(observable, {
 						rule: ruleName,
 						message: params.message,

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
@@ -524,7 +524,8 @@ kv.configuration = configuration;
 				//	  }
 				//  )};
 				//
-				if (params && (params.message || params.onlyIf)) { //if it has a message or condition object, then its an object literal to use
+				//if it has an embedded params, a message or condition object, then it's an object literal to use
+				if (params && (params.params || params.message || params.onlyIf)) {
 					return kv.addRule(observable, {
 						rule: ruleName,
 						message: params.message,

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
@@ -326,7 +326,8 @@
 				//	  }
 				//  )};
 				//
-				if (params && (params.message || params.onlyIf)) { //if it has a message or condition object, then its an object literal to use
+				//if it has an embedded params, a message or condition object, then it's an object literal to use
+				if (params && (params.params || params.message || params.onlyIf)) {
 					return ko.validation.addRule(observable, {
 						rule: ruleName,
 						message: params.message,

diff --git a/test/validation-tests.js b/test/validation-tests.js
@@ -79,6 +79,17 @@ QUnit.test('Custom Message Correctly appears', function(assert) {
     assert.observableIsNotValid(testObj, '', 'This Message is Special');
 });
 
+QUnit.test('Allow validation params in object without custom message and without onlyIf', function(assert) {
+    var testObj = ko.observable('something').extend({
+        minLength: {
+            params: 9
+            // no custom message, no onlyIf
+        }
+    });
+    testObj("short");
+    assert.violatesMinLengthRule(testObj, "short", 9);
+});
+
 //#endregion
 
 //#region Anonymous Rule Validation