Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions dist/knockout.validation.js
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,9 @@ kv.configuration = configuration;
},

formatMessage: function (message, params, observable) {
if (typeof message === 'object') {
return message;
}
if (utils.isObject(params) && params.typeAttr) {
params = params.value;
}
Expand Down
3 changes: 3 additions & 0 deletions src/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,9 @@
},

formatMessage: function (message, params, observable) {
if (typeof message === 'object') {
return message;
}
if (utils.isObject(params) && params.typeAttr) {
params = params.value;
}
Expand Down
22 changes: 22 additions & 0 deletions test/api-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -977,6 +977,28 @@ QUnit.test('formatMessage may use multiple replacements', function(assert) {
assert.equal(result, 'Value must be between 1 and 5.');
});

QUnit.test('formatMessage allows arbitrary object as message', function(assert) {
var params = null,
message = { custom: 'object' },
obsv = ko.observable();

var result = ko.validation.formatMessage(message, params, obsv);
assert.strictEqual(result, message, '`formatMessage` must return message object intact');
});

QUnit.test('arbitrary object can be used as a message', function(assert) {
var message = { custom: 'object' },
obsv = ko.observable().extend({
validation: {
validator: function () { return false; },
message: message
}
});

var result = obsv.error();
assert.strictEqual(result, message);
});

QUnit.test('Issue #547 - formatMessage fails when params is 0', function(assert) {
var params = 0,
message = 'Please enter a value greater than or equal to {0}.',
Expand Down