enable elasticX only for render, if mouseZoomable or focusChart

gordonwoodhull · gordonwoodhull · commit 551fdeb60b3a · 2019-12-13T12:34:22.000-05:00
toward #1623, #987
diff --git a/src/coordinate-grid-mixin.js b/src/coordinate-grid-mixin.js
@@ -479,7 +479,7 @@ dc.coordinateGridMixin = function (_chart) {
 
     function prepareXAxis (g, render) {
         if (!_chart.isOrdinal()) {
-            if (_chart.elasticX()) {
+            if (_chart.elasticX() && (render || (!_chart.mouseZoomable() && !_rangeChart))) {
                 _x.domain([_chart.xAxisMin(), _chart.xAxisMax()]);
             }
         } else { // _chart.isOrdinal()
@@ -1236,7 +1236,7 @@ dc.coordinateGridMixin = function (_chart) {
 
         _chart.plotData();
 
-        if (_chart.elasticX() || _resizing || render) {
+        if (_chart.elasticX() && (!_chart.mouseZoomable() && !_rangeChart) || _resizing || render) {
             _chart.renderXAxis(_chart.g());
         }
 

Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,7 @@ dc.coordinateGridMixin = function (_chart) {`
`479`	`479`
`480`	`480`	`function prepareXAxis (g, render) {`
`481`	`481`	`if (!_chart.isOrdinal()) {`
`482`		`- if (_chart.elasticX()) {`
	`482`	`+ if (_chart.elasticX() && (render \|\| (!_chart.mouseZoomable() && !_rangeChart))) {`
`483`	`483`	`_x.domain([_chart.xAxisMin(), _chart.xAxisMax()]);`
`484`	`484`	`}`
`485`	`485`	`} else { // _chart.isOrdinal()`
`@@ -1236,7 +1236,7 @@ dc.coordinateGridMixin = function (_chart) {`
`1236`	`1236`
`1237`	`1237`	`_chart.plotData();`
`1238`	`1238`
`1239`		`- if (_chart.elasticX() \|\| _resizing \|\| render) {`
	`1239`	`+ if (_chart.elasticX() && (!_chart.mouseZoomable() && !_rangeChart) \|\| _resizing \|\| render) {`
`1240`	`1240`	`_chart.renderXAxis(_chart.g());`
`1241`	`1241`	`}`
`1242`	`1242`