Commit f9ad16a4 authored by Masayuki Tanaka's avatar Masayuki Tanaka

Merge pull request #1188 from j-white/features/hide-from-legend-and-tooltip

Add the ability to prevent elements from the showing up in legend and tool-tip
parents f6add829 761269ac
...@@ -53,7 +53,7 @@ c3_chart_internal_fn.addName = function (data) { ...@@ -53,7 +53,7 @@ c3_chart_internal_fn.addName = function (data) {
var $$ = this, name; var $$ = this, name;
if (data) { if (data) {
name = $$.config.data_names[data.id]; name = $$.config.data_names[data.id];
data.name = name ? name : data.id; data.name = name !== undefined ? name : data.id;
} }
return data; return data;
}; };
......
...@@ -119,6 +119,9 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) { ...@@ -119,6 +119,9 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
var withTransition, withTransitionForTransform; var withTransition, withTransitionForTransform;
var texts, rects, tiles, background; 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 || {}; options = options || {};
withTransition = getOption(options, "withTransition", true); withTransition = getOption(options, "withTransition", true);
withTransitionForTransform = getOption(options, "withTransitionForTransform", true); withTransitionForTransform = getOption(options, "withTransitionForTransform", true);
......
...@@ -40,6 +40,8 @@ c3_chart_internal_fn.getTooltipContent = function (d, defaultTitleFormat, defaul ...@@ -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); value = valueFormat(d[i].value, d[i].ratio, d[i].id, d[i].index);
if (value !== undefined) { 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); name = nameFormat(d[i].name, d[i].ratio, d[i].id, d[i].index);
bgcolor = $$.levelColor ? $$.levelColor(d[i].value) : color(d[i].id); 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