Commit 761269ac authored by Jesse White's avatar Jesse White

Hide elements from the legend and tooltip when their name is null.

parent ae26e98e
......@@ -53,7 +53,7 @@ c3_chart_internal_fn.addName = function (data) {
var $$ = this, name;
if (data) {
name = $$.config.data_names[data.id];
data.name = name ? name : data.id;
data.name = name !== undefined ? name : data.id;
}
return data;
};
......
......@@ -119,6 +119,9 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
var withTransition, withTransitionForTransform;
var texts, rects, tiles, background;
// Skip elements when their name is set to null
targetIds = targetIds.filter(function(id) {return !isDefined(config.data_names[id]) || config.data_names[id] !== null;});
options = options || {};
withTransition = getOption(options, "withTransition", true);
withTransitionForTransform = getOption(options, "withTransitionForTransform", true);
......
......@@ -40,6 +40,8 @@ c3_chart_internal_fn.getTooltipContent = function (d, defaultTitleFormat, defaul
value = valueFormat(d[i].value, d[i].ratio, d[i].id, d[i].index);
if (value !== undefined) {
// Skip elements when their name is set to null
if (d[i].name === null) { continue; }
name = nameFormat(d[i].name, d[i].ratio, d[i].id, d[i].index);
bgcolor = $$.levelColor ? $$.levelColor(d[i].value) : color(d[i].id);
......
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