Commit 9c8233d3 authored by Sven Franck's avatar Sven Franck

app: fixed display of label in radio group

parent 755c2d92
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
theme, icon_string, input_type, need_text_node, container_class_list, theme, icon_string, input_type, need_text_node, container_class_list,
label_class_list, index, disabled, active, text, addLabel, readonly, label_class_list, index, disabled, active, text, addLabel, readonly,
mask_set, mask, star, hidden_field, icon, no_validate, has_opts, mask_set, mask, star, hidden_field, icon, no_validate, has_opts,
push_label, no_text; push_label, no_text, label_set;
// exit early with a span tag // exit early with a span tag
// TODO: make this with label et al // TODO: make this with label et al
...@@ -438,6 +438,7 @@ ...@@ -438,6 +438,7 @@
// This saves doing "invalid" handler with javascript // This saves doing "invalid" handler with javascript
if (spec.logic.add_label !== false && ((need_text_node === undefined && if (spec.logic.add_label !== false && ((need_text_node === undefined &&
(push_label || !label_inside) && !hidden_field) || spec.logic.route)) { (push_label || !label_inside) && !hidden_field) || spec.logic.route)) {
label_set = true;
label_target.appendChild(addLabel(spec, label_class_list)); label_target.appendChild(addLabel(spec, label_class_list));
} }
...@@ -458,7 +459,7 @@ ...@@ -458,7 +459,7 @@
element_target.appendChild(factory.element(spec)); element_target.appendChild(factory.element(spec));
// checkbox radio need label after input // checkbox radio need label after input
if (label_inside) { if (label_inside && !label_set) {
label_target.appendChild(addLabel(spec, label_class_list)); label_target.appendChild(addLabel(spec, label_class_list));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment