Minor cleanup

dc-js · Apr 7, 2018 · 328e1d8 · 328e1d8
1 parent 1d9b636
commit 328e1d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/spec/coordinate-grid-chart-spec.js b/spec/coordinate-grid-chart-spec.js
@@ -847,7 +847,6 @@ describe('dc.coordinateGridChart', function () {
         it('should update the range chart brush to match zoomed domain of focus chart', function () {
             spyOn(rangeChart, 'replaceFilter');
             chart.focus(selectedRange);
-            // expect(rangeChart.replaceFilter).toHaveBeenCalledWith(selectedRange);
             var replaceFilter = cleanDateRange(rangeChart.replaceFilter.calls.argsFor(0)[0]);
             expect(replaceFilter).toEqual(selectedRange);
         });

diff --git a/src/coordinate-grid-mixin.js b/src/coordinate-grid-mixin.js
@@ -1246,7 +1246,7 @@ dc.coordinateGridMixin = function (_chart) {
 
         if (_zoomOutRestrict) {
             // Ensure minimum zoomScale is at least 1
-            var zoomScaleMin = _zoomScale[0] < 1 ? 1 : _zoomScale[0];
+            var zoomScaleMin = Math.max(_zoomScale[0], 1);
             _zoom
                 .translateExtent(extent)
                 .scaleExtent([zoomScaleMin, _zoomScale[1]]);
@@ -1280,7 +1280,7 @@ dc.coordinateGridMixin = function (_chart) {
         if (!noRaiseEvents) {
             if (_rangeChart && !rangesEqual(_chart.filter(), _rangeChart.filter())) {
                 dc.events.trigger(function () {
-                    _rangeChart.replaceFilter(newDomain);
+                    _rangeChart.replaceFilter(domFilter);
                     _rangeChart.redraw();
                 });
             }
@@ -1292,16 +1292,6 @@ dc.coordinateGridMixin = function (_chart) {
         }
     }
 
-    // Our zooming is not standard d3 zoom as defined in their examples.
-    // Instead we want to focus the chart based on current zoom transform.
-    // The following code computes values of new domain the same way as transform.rescaleX.
-    // The difference is what we do after we get the newDomain
-    var _zoomTransformToDomain = function (transform, xScale) {
-        return xScale.range().map(function (xCoord) {
-            return _origX.invert(transform.invertX(xCoord));
-        });
-    };
-
     // _zoomTransformToDomain(transform, xScale) should give back newDomain
     var _domainToZoomTransform = function (newDomain, origDomain, xScale) {
         var k = (origDomain[1] - origDomain[0]) / (newDomain[1] - newDomain[0]);
@@ -1324,7 +1314,7 @@ dc.coordinateGridMixin = function (_chart) {
         d3.event = null;
         if (!event.sourceEvent) { return; }
 
-        var newDomain = _zoomTransformToDomain(event.transform, _origX);
+        var newDomain = event.transform.rescaleX(_origX).domain();
         _chart.focus(newDomain, false);
     }