Skip to content

Commit d73cbcb

Browse files
committed
Merge pull request DefinitelyTyped#4777 from Seltzer/jquery-validation-update
Update jquery.validation bindings and tests
2 parents 4ba73ef + 9319bd0 commit d73cbcb

File tree

2 files changed

+277
-230
lines changed

2 files changed

+277
-230
lines changed

jquery.validation/jquery.validation-tests.ts

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,17 @@ function test_validate() {
7777
$(".selector").validate({
7878
onclick: false
7979
});
80+
$(".selector").validate({
81+
onfocusout: (elt) => { },
82+
onkeyup: (elt) => { },
83+
onclick: (elt) => { }
84+
});
85+
$(".selector").validate({
86+
onfocusout: (elt, event) => { },
87+
onkeyup: (elt, event) => { },
88+
onclick: (elt, event) => { }
89+
});
90+
8091
$(".selector").validate({
8192
focusInvalid: false
8293
});
@@ -111,7 +122,7 @@ function test_validate() {
111122
submitHandler: function () { alert("Submitted!") }
112123
});
113124
$(".selector").validate({
114-
showErrors: function (errorMap: ErrorDictionary, errorList: ErrorListItem[]) {
125+
showErrors: function (errorMap: JQueryValidation.ErrorDictionary, errorList: JQueryValidation.ErrorListItem[]) {
115126
$("#summary").html("Your form contains " + this.numberOfInvalids() + " errors, see details below.");
116127
this.defaultShowErrors();
117128
}
@@ -154,6 +165,18 @@ function test_validate() {
154165
$(".selector").validate({
155166
ignoreTitle: true
156167
});
168+
// onSubmit, onfocusout, onkeyup, onclick
169+
$('.selector').validate({
170+
onsubmit: false,
171+
onfocusout: false,
172+
onkeyup: false,
173+
onclick: false,
174+
});
175+
$('.selector').validate({
176+
onfocusout: () => {},
177+
onkeyup: () => {},
178+
onclick: function(elt) { return 2; }
179+
});
157180
}
158181

159182
function test_methods() {
@@ -194,10 +217,15 @@ function test_methods() {
194217
validator.hideErrors();
195218
var isValid: boolean = validator.valid();
196219
var size: number = validator.size();
197-
var errorMap: ErrorDictionary = validator.errorMap;
198-
var errorList: ErrorListItem[] = validator.errorList;
220+
var errorMap: JQueryValidation.ErrorDictionary = validator.errorMap;
221+
var errorList: JQueryValidation.ErrorListItem[] = validator.errorList;
199222

200223
$("#summary").text(validator.numberOfInvalids() + " field(s) are invalid");
224+
var invalidElements: HTMLElement[] = validator.invalidElements();
225+
var validElements: HTMLElement[] = validator.validElements();
226+
}
227+
228+
function test_static_methods() {
201229
jQuery.validator.setDefaults({
202230
debug: true
203231
});
@@ -228,6 +256,11 @@ function test_methods() {
228256
maxlength: 5
229257
}
230258
});
231-
var invalidElements: HTMLElement[] = validator.invalidElements();
232-
var validElements: HTMLElement[] = validator.validElements();
259+
260+
// jQuery.validator.format
261+
jQuery.validator.format('{0}');
262+
jQuery.validator.format('{0} {1}')('a', 2);
263+
jQuery.validator.format('{0} {1}', 'a', 2);
264+
jQuery.validator.format('{0} {1}', ['a', 2]);
233265
}
266+

0 commit comments

Comments
 (0)