Skip to content

C
c3-closed
Commit f5da05e1 authored by Masayuki Tanaka's avatar Masayuki Tanaka
Browse files
Options

Merge pull request #1294 from daxfohl/master

Bugfix 1292, 1246 by making subchart axis hidden if subchart is hidden
parents 6d385be0 22438cc7
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
c3.js
View file @ f5da05e1
...@@ -5375,9 +5375,10 @@ ...@@ -5375,9 +5375,10 @@
}; };
c3_chart_internal_fn.initSubchart = function () { c3_chart_internal_fn.initSubchart = function () {
var $$ = this, config = $$.config, var $$ = this, config = $$.config,
context = $$.context = $$.svg.append("g").attr("transform", $$.getTranslate('context')); context = $$.context = $$.svg.append("g").attr("transform", $$.getTranslate('context')),
visibility = config.subchart_show ? 'visible' : 'hidden';
context.style('visibility', config.subchart_show ? 'visible' : 'hidden'); context.style('visibility', visibility);
// Define g for chart area // Define g for chart area
context.append('g') context.append('g')
...@@ -5404,7 +5405,7 @@ ...@@ -5404,7 +5405,7 @@
.attr("class", CLASS.axisX) .attr("class", CLASS.axisX)
.attr("transform", $$.getTranslate('subx')) .attr("transform", $$.getTranslate('subx'))
.attr("clip-path", config.axis_rotated ? "" : $$.clipPathForXAxis) .attr("clip-path", config.axis_rotated ? "" : $$.clipPathForXAxis)
.style("visibility", config.subchart_axis_x_show ? 'visible' : 'hidden'); .style("visibility", config.subchart_axis_x_show ? visibility : 'hidden');
}; };
c3_chart_internal_fn.updateTargetsForSubchart = function (targets) { c3_chart_internal_fn.updateTargetsForSubchart = function (targets) {
var $$ = this, context = $$.context, config = $$.config, var $$ = this, context = $$.context, config = $$.config,
......
c3.min.js
View file @ f5da05e1
This source diff could not be displayed because it is too large. You can view the blob instead.
src/subchart.js
View file @ f5da05e1
...@@ -11,9 +11,10 @@ c3_chart_internal_fn.initBrush = function () { ...@@ -11,9 +11,10 @@ c3_chart_internal_fn.initBrush = function () {
}; };
c3_chart_internal_fn.initSubchart = function () { c3_chart_internal_fn.initSubchart = function () {
var $$ = this, config = $$.config, var $$ = this, config = $$.config,
context = $$.context = $$.svg.append("g").attr("transform", $$.getTranslate('context')); context = $$.context = $$.svg.append("g").attr("transform", $$.getTranslate('context')),
visibility = config.subchart_show ? 'visible' : 'hidden';
context.style('visibility', config.subchart_show ? 'visible' : 'hidden'); context.style('visibility', visibility);
// Define g for chart area // Define g for chart area
context.append('g') context.append('g')
...@@ -40,7 +41,7 @@ c3_chart_internal_fn.initSubchart = function () { ...@@ -40,7 +41,7 @@ c3_chart_internal_fn.initSubchart = function () {
.attr("class", CLASS.axisX) .attr("class", CLASS.axisX)
.attr("transform", $$.getTranslate('subx')) .attr("transform", $$.getTranslate('subx'))
.attr("clip-path", config.axis_rotated ? "" : $$.clipPathForXAxis) .attr("clip-path", config.axis_rotated ? "" : $$.clipPathForXAxis)
.style("visibility", config.subchart_axis_x_show ? 'visible' : 'hidden'); .style("visibility", config.subchart_axis_x_show ? visibility : 'hidden');
}; };
c3_chart_internal_fn.updateTargetsForSubchart = function (targets) { c3_chart_internal_fn.updateTargetsForSubchart = function (targets) {
var $$ = this, context = $$.context, config = $$.config, var $$ = this, context = $$.context, config = $$.config,
......
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