Skip to content

Commit d9a8ab8

Browse files
committed
Merge pull request posabsolute#766 from mingliangfeng/master
make groupRequired work for checkboxes
2 parents 5542bc5 + 356aa00 commit d9a8ab8

File tree

2 files changed

+22
-20
lines changed

2 files changed

+22
-20
lines changed

js/jquery.validationEngine.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -906,24 +906,6 @@
906906
*/
907907
_required: function(field, rules, i, options, condRequired) {
908908
switch (field.prop("type")) {
909-
case "text":
910-
case "password":
911-
case "textarea":
912-
case "file":
913-
case "select-one":
914-
case "select-multiple":
915-
default:
916-
var field_val = $.trim( field.val() );
917-
var dv_placeholder = $.trim( field.attr("data-validation-placeholder") );
918-
var placeholder = $.trim( field.attr("placeholder") );
919-
if (
920-
( !field_val )
921-
|| ( dv_placeholder && field_val == dv_placeholder )
922-
|| ( placeholder && field_val == placeholder )
923-
) {
924-
return options.allrules[rules[i]].alertText;
925-
}
926-
break;
927909
case "radio":
928910
case "checkbox":
929911
// new validation style to only check dependent field
@@ -943,6 +925,24 @@
943925
return options.allrules[rules[i]].alertTextCheckboxMultiple;
944926
}
945927
break;
928+
case "text":
929+
case "password":
930+
case "textarea":
931+
case "file":
932+
case "select-one":
933+
case "select-multiple":
934+
default:
935+
var field_val = $.trim( field.val() );
936+
var dv_placeholder = $.trim( field.attr("data-validation-placeholder") );
937+
var placeholder = $.trim( field.attr("placeholder") );
938+
if (
939+
( !field_val )
940+
|| ( dv_placeholder && field_val == dv_placeholder )
941+
|| ( placeholder && field_val == placeholder )
942+
) {
943+
return options.allrules[rules[i]].alertText;
944+
}
945+
break;
946946
}
947947
},
948948
/**

js/languages/jquery.validationEngine-en.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@
3737
"alertText": "* Maximum ",
3838
"alertText2": " characters allowed"
3939
},
40-
"groupRequired": {
40+
"groupRequired": {
4141
"regex": "none",
42-
"alertText": "* You must fill one of the following fields"
42+
"alertText": "* You must fill one of the following fields",
43+
"alertTextCheckboxMultiple": "* Please select an option",
44+
"alertTextCheckboxe": "* This checkbox is required"
4345
},
4446
"min": {
4547
"regex": "none",

0 commit comments

Comments
 (0)