Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: cbi.js: enable validation for dropdown fields

Browse source 
Directly attach validation handlers to cbi dropdowns as well, this allows
validating dropdown choices made by the user, similar to how plain select
boxes are handled by the cbi JavaScript.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-11-05 18:43:32 +01:00
parent fa391e4f96
commit 56249c867e
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/luci-base/htdocs/luci-static/resources/cbi.js
View file

@ -569,7 +569,7 @@ var CBIValidatorPrototype = {
return;
var input = sibling.querySelector('[data-type]'),
values = input.getAttribute('data-is-list') ? input.value.match(/[^ \t]+/g) : [ input.value ];
values = input ? (input.getAttribute('data-is-list') ? input.value.match(/[^ \t]+/g) : [ input.value ]) : null;
if (values !== null && values.indexOf(ctx.value) !== -1)
unique = false;
@ -806,7 +806,9 @@ function cbi_combobox_init(id, values, def, man) {
'class': 'cbi-dropdown',
'display-items': 5,
'optional': obj.getAttribute('data-optional'),
'placeholder': _('-- Please choose --')
'placeholder': _('-- Please choose --'),
'data-type': obj.getAttribute('data-type'),
'data-optional': obj.getAttribute('data-optional')
}, [ E('ul') ]);
if (!(obj.value in values) && obj.value.length) {
@ -1134,6 +1136,7 @@ function cbi_validate_field(cbid, optional, type)
field.addEventListener("blur", validatorFn);
field.addEventListener("keyup", validatorFn);
field.addEventListener("cbi-dropdown-change", validatorFn);
if (matchesElem(field, 'select')) {
field.addEventListener("change", validatorFn);