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

libs/web: live validation fixes

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-10-30 01:03:20 +00:00
parent a3e66af2a3
commit 85a5d628ec
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
libs/web/htdocs/luci-static/resources/cbi.js
View file

@ -290,17 +290,21 @@ function cbi_combobox(id, values, def, man) {
var obj = document.getElementById(id) var obj = document.getElementById(id)
var sel = document.createElement("select"); var sel = document.createElement("select");
sel.id = selid; sel.id = selid;
sel.className = 'cbi-input-select'; sel.className = 'cbi-input-select';
if (obj.className && obj.className.match(/cbi-input-invalid/)) {
sel.className += ' cbi-input-invalid';
}
if (obj.nextSibling) { if (obj.nextSibling) {
obj.parentNode.insertBefore(sel, obj.nextSibling); obj.parentNode.insertBefore(sel, obj.nextSibling);
} else { } else {
obj.parentNode.appendChild(sel); obj.parentNode.appendChild(sel);
} }
var dt = obj.getAttribute('cbi_datatype');
var op = obj.getAttribute('cbi_optional');
if (dt)
cbi_validate_field(sel, op == 'true', dt);
if (!values[obj.value]) { if (!values[obj.value]) {
if (obj.value == "") { if (obj.value == "") {
var optdef = document.createElement("option"); var optdef = document.createElement("option");
@ -342,10 +346,6 @@ function cbi_combobox(id, values, def, man) {
obj.focus(); obj.focus();
} else { } else {
obj.value = sel.options[sel.selectedIndex].value; obj.value = sel.options[sel.selectedIndex].value;
var vld = obj.getAttribute("cbi_validate");
sel.className = (!vld || vld())
? 'cbi-input-select' : 'cbi-input-select cbi-input-invalid';
} }
try { try {
@ -642,7 +642,9 @@ function cbi_validate_field(cbid, optional, type)
field.className = field.className.replace(/ cbi-input-invalid/g, ''); field.className = field.className.replace(/ cbi-input-invalid/g, '');
// validate value // validate value
var value = (field.options) ? field.options[field.options.selectedIndex].value : field.value; var value = (field.options && field.options.selectedIndex > -1)
? field.options[field.options.selectedIndex].value : field.value;
if( !(((value.length == 0) && optional) || vldcb(value)) ) if( !(((value.length == 0) && optional) || vldcb(value)) )
{ {
// invalid // invalid
@ -662,11 +664,21 @@ function cbi_validate_field(cbid, optional, type)
cbi_bind(field, "blur", validator); cbi_bind(field, "blur", validator);
cbi_bind(field, "keyup", validator); cbi_bind(field, "keyup", validator);
if (field.nodeName == 'SELECT')
{
cbi_bind(field, "change", validator);
cbi_bind(field, "click", validator);
}
field.setAttribute("cbi_validate", validator); field.setAttribute("cbi_validate", validator);
field.setAttribute("cbi_datatype", type); field.setAttribute("cbi_datatype", type);
field.setAttribute("cbi_optional", (!!optional).toString()); field.setAttribute("cbi_optional", (!!optional).toString());
validator(); validator();
var fcbox = document.getElementById('cbi.combobox.' + field.id);
if (fcbox)
cbi_validate_field(fcbox, optional, type);
} }
} }