github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-04-29 03:00:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Inputs now always supply a <label> tag with a special CSS class for hiding NULL labels

Browse Source 
This helps to simplify the updating logic on the client
This commit is contained in:
Carson Sievert
2019-05-03 15:38:57 -05:00
parent 34ee48ef93
commit 370f1b51ee
25 changed files with 134 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
srcjs/utils.js
View File

@@ -328,33 +328,21 @@ exports.compareVersion = function(a, op, b) {
};
function updateLabel(labelTxt, labelNode, labelHTML, insertBeforeEl) {
function updateLabel(labelTxt, labelNode) {
// Only update if label was specified in the update method
if (typeof labelTxt === "undefined") return;
if (labelNode.length !== 1) {
throw new Error("labelNode must be of length 1");
}
// Should the label node exist?
var labelEmpty = $.isArray(labelTxt) && labelTxt.length === 0;
// Does the label node already exist?
var labelNode = labelNode || [];
var labelNodeExists = labelNode.length > 0;
if (labelNodeExists) {
if (labelEmpty) {
labelNode.remove();
} else {
labelNode.text(labelTxt);
}
// Should the label be empty?
var emptyLabel = $.isArray(labelTxt) && labelTxt.length === 0;
if (emptyLabel) {
labelNode.addClass("shiny-label-null");
} else {
if (!labelEmpty) {
// Some labels are actually spans
var newLabelNode = $(labelHTML).text(labelTxt);
newLabelNode.insertBefore(insertBeforeEl);
}
labelNode.text(labelTxt);
labelNode.removeClass("shiny-label-null");
}
}