Skip to content

C
c3-closed
Commit d8a15b9e authored by Evgeny's avatar Evgeny
Browse files
Options

Fix problem with 1 header

parent 3a69bf7c
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 4 deletions
c3.js
View file @ d8a15b9e
...@@ -4165,6 +4165,10 @@ ...@@ -4165,6 +4165,10 @@
withTransition = getOption(options, "withTransition", true); withTransition = getOption(options, "withTransition", true);
withTransitionForTransform = getOption(options, "withTransitionForTransform", true); withTransitionForTransform = getOption(options, "withTransitionForTransform", true);
function legendText(id){
return isDefined(config.data_names[id]) ? config.data_names[id] : isDefined(config.data_names.id) ? config.data_names.id : id;
}
function getTextBox(textElement, id) { function getTextBox(textElement, id) {
if (!legendItemTextBox[id]) { if (!legendItemTextBox[id]) {
legendItemTextBox[id] = $$.getTextRect(textElement.textContent, CLASS.legendItem); legendItemTextBox[id] = $$.getTextRect(textElement.textContent, CLASS.legendItem);
...@@ -4290,7 +4294,7 @@ ...@@ -4290,7 +4294,7 @@
} }
}); });
l.append('text') l.append('text')
.text(function (id) { return isDefined(config.data_names[id]) ? config.data_names[id] : id; }) .text(legendText)
.each(function (id, i) { updatePositions(this, id, i); }) .each(function (id, i) { updatePositions(this, id, i); })
.style("pointer-events", "none") .style("pointer-events", "none")
.attr('x', $$.isLegendRight || $$.isLegendInset ? xForLegendText : -200) .attr('x', $$.isLegendRight || $$.isLegendInset ? xForLegendText : -200)
...@@ -4319,7 +4323,7 @@ ...@@ -4319,7 +4323,7 @@
texts = $$.legend.selectAll('text') texts = $$.legend.selectAll('text')
.data(targetIds) .data(targetIds)
.text(function (id) { return isDefined(config.data_names[id]) ? config.data_names[id] : id; }) // MEMO: needed for update .text(legendText) // MEMO: needed for update
.each(function (id, i) { updatePositions(this, id, i); }); .each(function (id, i) { updatePositions(this, id, i); });
(withTransition ? texts.transition() : texts) (withTransition ? texts.transition() : texts)
.attr('x', xForLegendText) .attr('x', xForLegendText)
......
src/legend.js
View file @ d8a15b9e
...@@ -124,6 +124,10 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) { ...@@ -124,6 +124,10 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
withTransition = getOption(options, "withTransition", true); withTransition = getOption(options, "withTransition", true);
withTransitionForTransform = getOption(options, "withTransitionForTransform", true); withTransitionForTransform = getOption(options, "withTransitionForTransform", true);
function legendText(id){
return isDefined(config.data_names[id]) ? config.data_names[id] : isDefined(config.data_names.id) ? config.data_names.id : id;
}
function getTextBox(textElement, id) { function getTextBox(textElement, id) {
if (!legendItemTextBox[id]) { if (!legendItemTextBox[id]) {
legendItemTextBox[id] = $$.getTextRect(textElement.textContent, CLASS.legendItem); legendItemTextBox[id] = $$.getTextRect(textElement.textContent, CLASS.legendItem);
...@@ -249,7 +253,7 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) { ...@@ -249,7 +253,7 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
} }
}); });
l.append('text') l.append('text')
.text(function (id) { return isDefined(config.data_names[id]) ? config.data_names[id] : id; }) .text(legendText)
.each(function (id, i) { updatePositions(this, id, i); }) .each(function (id, i) { updatePositions(this, id, i); })
.style("pointer-events", "none") .style("pointer-events", "none")
.attr('x', $$.isLegendRight || $$.isLegendInset ? xForLegendText : -200) .attr('x', $$.isLegendRight || $$.isLegendInset ? xForLegendText : -200)
...@@ -278,7 +282,7 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) { ...@@ -278,7 +282,7 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
texts = $$.legend.selectAll('text') texts = $$.legend.selectAll('text')
.data(targetIds) .data(targetIds)
.text(function (id) { return isDefined(config.data_names[id]) ? config.data_names[id] : id; }) // MEMO: needed for update .text(legendText) // MEMO: needed for update
.each(function (id, i) { updatePositions(this, id, i); }); .each(function (id, i) { updatePositions(this, id, i); });
(withTransition ? texts.transition() : texts) (withTransition ? texts.transition() : texts)
.attr('x', xForLegendText) .attr('x', xForLegendText)
......
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