reset filter when brushed with empty extent

tttp · Oct 21, 2013 · 34023ba · 34023ba
1 parent d5590f9
commit 34023ba
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 40 deletions.
diff --git a/dc.js b/dc.js
@@ -2202,23 +2202,11 @@ dc.coordinateGridChart = function (_chart) {
         return _brush.empty() || !extent || extent[1] <= extent[0];
     };
 
-    _chart.brushHasNoLength = function(extent) {
-        if (extent[0] instanceof Date && extent[1] instanceof Date) {
-            return extent[0].getTime() == extent[1].getTime();
-        } else {
-            return extent[0] == extent[1];
-        }
-    };
-
     _chart._brushing = function() {
         var extent = _chart.extendBrush();
 
         _chart.redrawBrush(_g);
 
-        if (_chart.brushHasNoLength(extent)) {
-            return;
-        }
-
         if (_chart.brushIsEmpty(extent)) {
             dc.events.trigger(function () {
                 _chart.filter(null);

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/coordinate-grid-chart.js b/src/coordinate-grid-chart.js
@@ -679,23 +679,11 @@ dc.coordinateGridChart = function (_chart) {
         return _brush.empty() || !extent || extent[1] <= extent[0];
     };
 
-    _chart.brushHasNoLength = function(extent) {
-        if (extent[0] instanceof Date && extent[1] instanceof Date) {
-            return extent[0].getTime() == extent[1].getTime();
-        } else {
-            return extent[0] == extent[1];
-        }
-    };
-
     _chart._brushing = function() {
         var extent = _chart.extendBrush();
 
         _chart.redrawBrush(_g);
 
-        if (_chart.brushHasNoLength(extent)) {
-            return;
-        }
-
         if (_chart.brushIsEmpty(extent)) {
             dc.events.trigger(function () {
                 _chart.filter(null);

diff --git a/test/coordinate-grid-chart-test.js b/test/coordinate-grid-chart-test.js
@@ -35,7 +35,7 @@ suite.addBatch({
 
         'should not trigger a filter event': function(chart) {
             chart._brushing();
-            assert.isTrue(chart.filter.notCalled);
+            assert.isTrue(chart.filter.calledWith(null));
         }
     }
 });

diff --git a/web/js/dc.js b/web/js/dc.js
@@ -2202,23 +2202,11 @@ dc.coordinateGridChart = function (_chart) {
         return _brush.empty() || !extent || extent[1] <= extent[0];
     };
 
-    _chart.brushHasNoLength = function(extent) {
-        if (extent[0] instanceof Date && extent[1] instanceof Date) {
-            return extent[0].getTime() == extent[1].getTime();
-        } else {
-            return extent[0] == extent[1];
-        }
-    };
-
     _chart._brushing = function() {
         var extent = _chart.extendBrush();
 
         _chart.redrawBrush(_g);
 
-        if (_chart.brushHasNoLength(extent)) {
-            return;
-        }
-
         if (_chart.brushIsEmpty(extent)) {
             dc.events.trigger(function () {
                 _chart.filter(null);