Merge branch 'vladsu-master'

56092012 · Masayuki Tanaka · d9d5c5e9 · 10a560cf · 56092012 · 56092012
Commit 56092012 authored Jun 06, 2015 by Masayuki Tanaka
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

c3.js c3.js +3 -1

c3.min.js c3.min.js +0 -0

config.js src/config.js +1 -0

subchart.js src/subchart.js +2 -1

No files found.
--- a/c3.js
+++ b/c3.js
@@ -1089,6 +1089,7 @@
            // subchart
            subchart_show: false,
            subchart_size_height: 60,
+            subchart_axis_x_show: true,
            subchart_onbrush: function () {},
            // color
            color_pattern: [],
@@ -5360,7 +5361,8 @@
        $$.axes.subx = context.append("g")
            .attr("class", CLASS.axisX)
            .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) {
        var $$ = this, context = $$.context, config = $$.config,

--- a/c3.min.js
+++ b/c3.min.js
--- a/src/config.js
+++ b/src/config.js
@@ -65,6 +65,7 @@ c3_chart_internal_fn.getDefaultConfig = function () {
        // subchart
        subchart_show: false,
        subchart_size_height: 60,
+        subchart_axis_x_show: true,
        subchart_onbrush: function () {},
        // color
        color_pattern: [],

--- a/src/subchart.js
+++ b/src/subchart.js
@@ -39,7 +39,8 @@ c3_chart_internal_fn.initSubchart = function () {
    $$.axes.subx = context.append("g")
        .attr("class", CLASS.axisX)
        .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) {
    var $$ = this, context = $$.context, config = $$.config,