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

luci-base: ui.js: mark widget optional if empty choice is present

Browse source 
Fixes: #2943
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-07-28 17:24:12 +02:00
parent b20f000c85
commit 360e9769d6
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -223,6 +223,9 @@ var UISelect = UIElement.extend({
widget: 'select', widget: 'select',
orientation: 'horizontal' orientation: 'horizontal'
}, options); }, options);
if (this.choices.hasOwnProperty(''))
this.options.optional = true;
}, },
render: function() { render: function() {
@ -243,7 +246,7 @@ var UISelect = UIElement.extend({
'multiple': this.options.multiple ? '' : null 'multiple': this.options.multiple ? '' : null
})); }));
if (this.options.optional || this.choices.hasOwnProperty('')) if (this.options.optional)
frameEl.lastChild.appendChild(E('option', { frameEl.lastChild.appendChild(E('option', {
'value': '', 'value': '',
'selected': (this.values.length == 0 || this.values[0] == '') ? '' : null 'selected': (this.values.length == 0 || this.values[0] == '') ? '' : null