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

libs/web: support placeholder attribute for comboboxes, fix validation quirks with input->select transition in comboboxes

Browse source
This commit is contained in:
Jo-Philipp Wich 2012-08-09 11:25:25 +00:00
parent 6c66d91336
commit b35ab62ada
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -441,7 +441,7 @@ 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 = obj.className.replace(/cbi-input-text/, 'cbi-input-select');
if (obj.nextSibling) { if (obj.nextSibling) {
obj.parentNode.insertBefore(sel, obj.nextSibling); obj.parentNode.insertBefore(sel, obj.nextSibling);
@ -504,6 +504,10 @@ function cbi_combobox(id, values, def, man) {
//Do nothing //Do nothing
} }
}) })
// Retrigger validation in select
sel.focus();
sel.blur();
} }
function cbi_combobox_init(id, values, def, man) { function cbi_combobox_init(id, values, def, man) {

2
libs/web/luasrc/view/cbi/value.htm
View file

@ -18,6 +18,8 @@
-%> -%>
}, '<%- if not self.rmempty and not self.optional then -%> }, '<%- if not self.rmempty and not self.optional then -%>
<%-: -- Please choose -- -%> <%-: -- Please choose -- -%>
<%- elseif self.placeholder then -%>
<%-= pcdata(self.placeholder) -%>
<%- end -%>', ' <%- end -%>', '
<%- if self.combobox_manual then -%> <%- if self.combobox_manual then -%>
<%-=self.combobox_manual-%> <%-=self.combobox_manual-%>