don't reset y scales just for elasticity

fixes #973 Thanks @mtraynham! #973 (comment)
dc-js · Aug 6, 2015 · 9b4242a · 9b4242a
1 parent 9ccf415
commit 9b4242a
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 16 deletions.
diff --git a/dc.js b/dc.js
diff --git a/dc.js.map b/dc.js.map
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/src/composite-chart.js b/src/composite-chart.js
@@ -113,7 +113,9 @@ dc.compositeChart = function (parent, chartGroup) {
 
     function prepareRightYAxis() {
         if (_chart.rightY() === undefined || _chart.elasticY()) {
-            _chart.rightY(d3.scale.linear());
+            if (_chart.rightY() === undefined) {
+                _chart.rightY(d3.scale.linear());
+            }
             _chart.rightY().domain([rightYAxisMin(), rightYAxisMax()]).rangeRound([_chart.yAxisHeight(), 0]);
         }
 
@@ -125,7 +127,9 @@ dc.compositeChart = function (parent, chartGroup) {
 
     function prepareLeftYAxis() {
         if (_chart.y() === undefined || _chart.elasticY()) {
-            _chart.y(d3.scale.linear());
+            if (_chart.y() === undefined) {
+                _chart.y(d3.scale.linear());
+            }
             _chart.y().domain([yAxisMin(), yAxisMax()]).rangeRound([_chart.yAxisHeight(), 0]);
         }
 
@@ -315,6 +319,7 @@ dc.compositeChart = function (parent, chartGroup) {
             return _rightY;
         }
         _rightY = _;
+        _chart.rescale();
         return _chart;
     };
 

diff --git a/src/coordinate-grid-mixin.js b/src/coordinate-grid-mixin.js
@@ -530,7 +530,9 @@ dc.coordinateGridMixin = function (_chart) {
 
     _chart._prepareYAxis = function (g) {
         if (_y === undefined || _chart.elasticY()) {
-            _y = d3.scale.linear();
+            if (_y === undefined) {
+                _y = d3.scale.linear();
+            }
             var min = _chart.yAxisMin() || 0,
                 max = _chart.yAxisMax() || 0;
             _y.domain([min, max]).rangeRound([_chart.yAxisHeight(), 0]);

diff --git a/web/js/dc.js b/web/js/dc.js
diff --git a/web/js/dc.js.map b/web/js/dc.js.map
diff --git a/web/js/dc.min.js b/web/js/dc.min.js
diff --git a/web/js/dc.min.js.map b/web/js/dc.min.js.map