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

Fixes: #2943
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/modules/luci-base/htdocs/luci-static/resources/ui.js b/modules/luci-base/htdocs/luci-static/resources/ui.js
index f6a964fb10b4247351fd4c3f74aeeca17694a57e..fd413042f9aa13a12079abdf023f9c0a2939a061 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/ui.js
+++ b/modules/luci-base/htdocs/luci-static/resources/ui.js
@@ -223,6 +223,9 @@ var UISelect = UIElement.extend({
                        widget: 'select',
                        orientation: 'horizontal'
                }, options);
+
+               if (this.choices.hasOwnProperty(''))
+                       this.options.optional = true;
        },
 
        render: function() {
@@ -243,7 +246,7 @@ var UISelect = UIElement.extend({
                                'multiple': this.options.multiple ? '' : null
                        }));
 
-                       if (this.options.optional || this.choices.hasOwnProperty(''))
+                       if (this.options.optional)
                                frameEl.lastChild.appendChild(E('option', {
                                        'value': '',
                                        'selected': (this.values.length == 0 || this.values[0] == '') ? '' : null