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
6 changes: 6 additions & 0 deletions Dist/knockout.validation.js
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,12 @@ kv.configuration = configuration;
addRule: function (observable, rule) {
observable.extend({ validatable: true });

var existingRule = koUtils.arrayFirst(observable.rules(), function (item) {
return rule.rule === item.rule;
});
if (existingRule) {
observable.rules.remove(existingRule);
}
//push a Rule Context to the observables local array of Rule Contexts
observable.rules.push(rule);
return observable;
Expand Down
2 changes: 1 addition & 1 deletion Dist/knockout.validation.min.js

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions Src/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,12 @@
addRule: function (observable, rule) {
observable.extend({ validatable: true });

var existingRule = ko.utils.arrayFirst(observable.rules(), function (item) {
return rule.rule === item.rule;
});
if (existingRule) {
observable.rules.remove(existingRule);
}
//push a Rule Context to the observables local array of Rule Contexts
observable.rules.push(rule);
return observable;
Expand Down
16 changes: 16 additions & 0 deletions Tests/api-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,22 @@ test('validatedObservable is not Valid when not modified', function () {

//#endregion

//#region Adding rules

test("addRule removes previous rule with same name if that exists", function () {
var observable = ko.observable();
var rulesMutated = false;
observable.extend({ validatable: true });
ko.validation.addRule(observable, { rule: 'required', params: true });
observable.rules.subscribe(function () { rulesMutated = true; });
ko.validation.addRule(observable, { rule: 'required', params: false });
equal(observable.rules().length, 1);
equal(observable.rules()[0].params, false);
ok(rulesMutated);
});

//#endregion

//#region setRules Tests
module("setRules Tests");

Expand Down