Commit 56092012 authored by Masayuki Tanaka's avatar Masayuki Tanaka

Merge branch 'vladsu-master'

parents d9d5c5e9 10a560cf
...@@ -1089,6 +1089,7 @@ ...@@ -1089,6 +1089,7 @@
// subchart // subchart
subchart_show: false, subchart_show: false,
subchart_size_height: 60, subchart_size_height: 60,
subchart_axis_x_show: true,
subchart_onbrush: function () {}, subchart_onbrush: function () {},
// color // color
color_pattern: [], color_pattern: [],
...@@ -5360,7 +5361,8 @@ ...@@ -5360,7 +5361,8 @@
$$.axes.subx = context.append("g") $$.axes.subx = context.append("g")
.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');
}; };
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,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -65,6 +65,7 @@ c3_chart_internal_fn.getDefaultConfig = function () { ...@@ -65,6 +65,7 @@ c3_chart_internal_fn.getDefaultConfig = function () {
// subchart // subchart
subchart_show: false, subchart_show: false,
subchart_size_height: 60, subchart_size_height: 60,
subchart_axis_x_show: true,
subchart_onbrush: function () {}, subchart_onbrush: function () {},
// color // color
color_pattern: [], color_pattern: [],
......
...@@ -39,7 +39,8 @@ c3_chart_internal_fn.initSubchart = function () { ...@@ -39,7 +39,8 @@ c3_chart_internal_fn.initSubchart = function () {
$$.axes.subx = context.append("g") $$.axes.subx = context.append("g")
.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');
}; };
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