Skip to content

Commit 650998f

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents ee3a3d0 + 5b56031 commit 650998f

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Bundled with many locales, the error prompts can be translated into the language
2121

2222
Documentation :
2323
---
24-
###[Nicer documention](http://posabsolute.github.com/jQuery-Validation-Engine/)
25-
###[Release Notes](http://posabsolute.github.com/jQuery-Validation-Engine/releases.html)
24+
### [Nicer documention](http://posabsolute.github.com/jQuery-Validation-Engine/)
25+
### [Release Notes](http://posabsolute.github.com/jQuery-Validation-Engine/releases.html)
2626

2727

2828
Demo :
@@ -439,7 +439,7 @@ Speaks for itself, fails if the element has no value. This validator can apply t
439439
<input value="" class="validate[required]" type="text" name="email" id="email" />
440440
<input class="validate[required]" type="checkbox" id="agree" name="agree"/>
441441

442-
<select name="sport" id="sport" class="validate[required]" id="sport">
442+
<select name="sport" class="validate[required]" id="sport">
443443
<option value="">Choose a sport</option>
444444
<option value="option1">Tennis</option>
445445
<option value="option2">Football</option>

js/jquery.validationEngine.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,13 @@
136136
var form = element.closest('form, .validationEngineContainer');
137137
options = (form.data('jqv')) ? form.data('jqv') : $.validationEngine.defaults;
138138
valid = methods._validateField(element, options);
139-
139+
140140
if (valid && options.onFieldSuccess)
141141
options.onFieldSuccess();
142142
else if (options.onFieldFailure && options.InvalidFields.length > 0) {
143143
options.onFieldFailure();
144144
}
145-
145+
146146
return !valid;
147147
}
148148
if(options.onValidationComplete) {
@@ -225,11 +225,11 @@
225225
/**
226226
* Closes all error prompts on the page
227227
*/
228-
hideAll: function() {
228+
hideAll: function() {
229229
var form = this;
230230
var options = form.data('jqv');
231231
var duration = options ? options.fadeDuration:300;
232-
$('.formError').fadeTo(duration, 0, function() {
232+
$('.formError').fadeTo(duration, 0, function() {
233233
$(this).closest('.formError').remove();
234234
});
235235
return this;
@@ -765,7 +765,7 @@
765765
var fieldType = field.prop("type");
766766
var positionType=field.data("promptPosition") || options.promptPosition;
767767

768-
if ((fieldType == "radio" || fieldType == "checkbox") && form.find("input[name='" + fieldName + "']").size() > 1) {
768+
if ((fieldType == "radio" || fieldType == "checkbox") && form.find("input[name='" + fieldName + "']").length > 1) {
769769
if(positionType === 'inline') {
770770
field = $(form.find("input[name='" + fieldName + "'][type!=hidden]:last"));
771771
} else {
@@ -965,8 +965,8 @@
965965
// old validation style
966966
var form = field.closest("form, .validationEngineContainer");
967967
var name = field.attr("name");
968-
if (form.find("input[name='" + name + "']:checked").size() == 0) {
969-
if (form.find("input[name='" + name + "']:visible").size() == 1)
968+
if (form.find("input[name='" + name + "']:checked").length == 0) {
969+
if (form.find("input[name='" + name + "']:visible").length == 1)
970970
return options.allrules[rules[i]].alertTextCheckboxe;
971971
else
972972
return options.allrules[rules[i]].alertTextCheckboxMultiple;
@@ -1338,7 +1338,7 @@
13381338

13391339
var nbCheck = rules[i + 1];
13401340
var groupname = field.attr("name");
1341-
var groupSize = form.find("input[name='" + groupname + "']:checked").size();
1341+
var groupSize = form.find("input[name='" + groupname + "']:checked").length;
13421342
if (groupSize > nbCheck) {
13431343
options.showArrow = false;
13441344
if (options.allrules.maxCheckbox.alertText2)
@@ -1360,7 +1360,7 @@
13601360

13611361
var nbCheck = rules[i + 1];
13621362
var groupname = field.attr("name");
1363-
var groupSize = form.find("input[name='" + groupname + "']:checked").size();
1363+
var groupSize = form.find("input[name='" + groupname + "']:checked").length;
13641364
if (groupSize < nbCheck) {
13651365
options.showArrow = false;
13661366
return options.allrules.minCheckbox.alertText + " " + nbCheck + " " + options.allrules.minCheckbox.alertText2;
@@ -1780,7 +1780,7 @@
17801780
"opacity": 0,
17811781
"display": "block"
17821782
});
1783-
1783+
17841784
if (noAnimation)
17851785
prompt.css(css);
17861786
else

js/languages/jquery.validationEngine-et.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"email": {
8484
// Shamelessly lifted from Scott Gonzalez via the Bassistance Validation plugin http://projects.scottsplayground.com/email_address_validation/
8585
"regex": /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/,
86-
"alertText": "* Vigane emaili aadres"
86+
"alertText": "* Vigane e-posti aadress"
8787
},
8888
"integer": {
8989
"regex": /^[\-\+]?\d+$/,

0 commit comments

Comments
 (0)