github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-02-08 21:55:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

make sure to remove label tag from DOM if label is updated to NULL

Browse Source
This commit is contained in:
Carson Sievert
2019-04-26 19:08:15 -05:00
parent 938332d646
commit 5e8bc204c1
5 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
srcjs/input_binding_text.js
View File

@@ -27,15 +27,26 @@ $.extend(textInputBinding, {
if (data.hasOwnProperty('value'))
this.setValue(el, data.value);
var labelTag = $(el).parent().find('label[for="' + $escape(el.id) + '"]');
var hasLabelTag = labelTag.length > 0;
// If data.label exists, then we may need to insert a label
// tag into the DOM. If it doesn't exist, then the label tag
// should be removed to be more consistent with the behavior
// of `textInput(label = NULL)`
if (data.hasOwnProperty('label')) {
var label = $(el).parent().find('label[for="' + $escape(el.id) + '"]');
// If textInput(label=NULL), then no label tag is provided from the
// server, so create one if we need to.
if (label.length === 0) {
$('<label for="' + $escape(el.id) + '">' + data.label + '</label>').insertBefore(el);
if (hasLabelTag) {
labelTag.text(data.label);
} else {
label.text(data.label);
$('<label for="' + $escape(el.id) + '">' + data.label + '</label>').insertBefore(el);
}
} else {
if (hasLabelTag) labelTag.remove();
}
if (data.hasOwnProperty('placeholder'))