Fix x-axis position on chart redraw

Conflicts: dc.min.js dc.min.js.map
vaucouleur · Aug 5, 2015 · c3d9ee9 · c3d9ee9
1 parent 4d195d1
commit c3d9ee9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/dc.js b/dc.js
diff --git a/dc.min.js b/dc.min.js
diff --git a/dc.min.js.map b/dc.min.js.map
diff --git a/spec/coordinate-grid-chart-spec.js b/spec/coordinate-grid-chart-spec.js
@@ -257,6 +257,11 @@ describe('dc.coordinateGridChart', function() {
                 expect(chart.select("g.x").attr("transform")).toMatchTranslate(0,150);
             });
 
+            it('should update x axis position when the chart height is changed', function() {
+                chart.elasticX(true).height(400).redraw();
+                expect(chart.select("g.x").attr("transform")).toMatchTranslate(0,400);
+            });
+
             describe("labels", function() {
                 beforeEach(function() {
                     expect(chart.effectiveHeight()).toBe(130);

diff --git a/src/coordinate-grid-mixin.js b/src/coordinate-grid-mixin.js
@@ -429,8 +429,7 @@ dc.coordinateGridMixin = function (_chart) {
 
         if (axisXG.empty()) {
             axisXG = g.append('g')
-                .attr('class', 'axis x')
-                .attr('transform', 'translate(' + _chart.margins().left + ',' + _chart._xAxisY() + ')');
+                .attr('class', 'axis x');
         }
 
         var axisXLab = g.selectAll('text.' + X_AXIS_LABEL_CLASS);
@@ -447,6 +446,7 @@ dc.coordinateGridMixin = function (_chart) {
         }
 
         dc.transition(axisXG, _chart.transitionDuration())
+            .attr('transform', 'translate(' + _chart.margins().left + ',' + _chart._xAxisY() + ')')
             .call(_xAxis);
     };