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

luci-base: ui.js: fixes for radio widget type of select element

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2020-04-28 09:48:34 +02:00
parent 17ffc84a29
commit 2fb55e1ab5
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/luci-base/htdocs/luci-static/resources/ui.js
View file

@ -739,12 +739,14 @@ var UISelect = UIElement.extend(/** @lends LuCI.ui.Select.prototype */ {
} }
} }
else { else {
var brEl = (this.options.orientation === 'horizontal') ? document.createTextNode(' ') : E('br'); var brEl = (this.options.orientation === 'horizontal') ? document.createTextNode(' \xa0 ') : E('br');
for (var i = 0; i < keys.length; i++) { for (var i = 0; i < keys.length; i++) {
frameEl.appendChild(E('label', {}, [ frameEl.appendChild(E('span', {
'class': 'cbi-%s'.format(this.options.multiple ? 'checkbox' : 'radio')
}, [
E('input', { E('input', {
'id': this.options.id ? 'widget.' + this.options.id : null, 'id': this.options.id ? 'widget.%s.%d'.format(this.options.id, i) : null,
'name': this.options.id || this.options.name, 'name': this.options.id || this.options.name,
'type': this.options.multiple ? 'checkbox' : 'radio', 'type': this.options.multiple ? 'checkbox' : 'radio',
'class': this.options.multiple ? 'cbi-input-checkbox' : 'cbi-input-radio', 'class': this.options.multiple ? 'cbi-input-checkbox' : 'cbi-input-radio',
@ -752,11 +754,15 @@ var UISelect = UIElement.extend(/** @lends LuCI.ui.Select.prototype */ {
'checked': (this.values.indexOf(keys[i]) > -1) ? '' : null, 'checked': (this.values.indexOf(keys[i]) > -1) ? '' : null,
'disabled': this.options.disabled ? '' : null 'disabled': this.options.disabled ? '' : null
}), }),
this.choices[keys[i]] || keys[i] E('label', { 'for': this.options.id ? 'widget.%s.%d'.format(this.options.id, i) : null }),
E('span', {
'click': function(ev) {
ev.currentTarget.previousElementSibling.previousElementSibling.click();
}
}, [ this.choices[keys[i]] || keys[i] ])
])); ]));
if (i + 1 == this.options.size) frameEl.appendChild(brEl.cloneNode());
frameEl.appendChild(brEl);
} }
} }
@ -789,7 +795,7 @@ var UISelect = UIElement.extend(/** @lends LuCI.ui.Select.prototype */ {
if (this.options.widget == 'select') if (this.options.widget == 'select')
return this.node.firstChild.value; return this.node.firstChild.value;
var radioEls = frameEl.querySelectorAll('input[type="radio"]'); var radioEls = this.node.querySelectorAll('input[type="radio"]');
for (var i = 0; i < radioEls.length; i++) for (var i = 0; i < radioEls.length; i++)
if (radioEls[i].checked) if (radioEls[i].checked)
return radioEls[i].value; return radioEls[i].value;