luci-base: form.js / ui.js: tie form labels to widgets

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 22ba6fc40933bee02c3ea93bbda952bb44bf3af1)
(cherry picked from commit 82fb5a67d39d965595d2ad833dbf930e559c0202)

diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js
index 51893925fe7aade8816155c2ffcdb76e0d0f7872..e547260e4e89579f0f889f1e5d40a6e9a9d674ef 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/form.js
+++ b/modules/luci-base/htdocs/luci-static/resources/form.js
@@ -1642,7 +1642,16 @@ var CBIValue = CBIAbstractValue.extend({
                        if (typeof(this.title) === 'string' && this.title !== '') {
                                optionEl.appendChild(E('label', {
                                        'class': 'cbi-value-title',
-                                       'for': 'widget.cbid.%s.%s.%s'.format(config_name, section_id, this.option)
+                                       'for': 'widget.cbid.%s.%s.%s'.format(config_name, section_id, this.option),
+                                       'click': function(ev) {
+                                               var node = ev.currentTarget,
+                                                   elem = node.nextElementSibling.querySelector('#' + node.getAttribute('for')) || node.nextElementSibling.querySelector('[data-widget-id="' + node.getAttribute('for') + '"]');
+
+                                               if (elem) {
+                                                       elem.click();
+                                                       elem.focus();
+                                               }
+                                       }
                                },
                                this.titleref ? E('a', {
                                        'class': 'cbi-title-ref',

diff --git a/modules/luci-base/htdocs/luci-static/resources/ui.js b/modules/luci-base/htdocs/luci-static/resources/ui.js
index 97cdbf391c3762b4f32063a927b7c9c792ec0775..dfc3dbdf02bbed03cdd452d57b1189fbc8598644 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/ui.js
+++ b/modules/luci-base/htdocs/luci-static/resources/ui.js
@@ -556,7 +556,8 @@ var UICheckbox = UIElement.extend(/** @lends LuCI.ui.Checkbox.prototype */ {
                        'name': this.options.name,
                        'type': 'checkbox',
                        'value': this.options.value_enabled,
-                       'checked': (this.value == this.options.value_enabled) ? '' : null
+                       'checked': (this.value == this.options.value_enabled) ? '' : null,
+                       'data-widget-id': this.options.id ? 'widget.' + this.options.id : null
                }));
 
                frameEl.appendChild(E('label', { 'for': id }));