Updates to non filtered brushing

dc-js · Mar 25, 2015 · facae4a · facae4a
1 parent 92ddb48
commit facae4a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/base-mixin.js b/src/base-mixin.js
@@ -706,6 +706,10 @@ dc.baseMixin = function (_chart) {
         _chart.filter(_);
     };
 
+    _chart.setFilter = function (_) {
+        _filters = _ ? [_] : [];
+    };
+
     /**
     #### .filter([filterValue])
     Filter the chart by the given value or return the current filter if the input parameter is missing.

diff --git a/src/coordinate-grid-mixin.js b/src/coordinate-grid-mixin.js
@@ -911,8 +911,12 @@ dc.coordinateGridMixin = function (_chart) {
     };
 
     _chart._nonFilteredBrushing = function () {
-        _chart.extendBrush();
-        _chart.redrawBrush(_g);
+        var extent = _chart.extendBrush();
+        if (_chart.brushIsEmpty(extent)) {
+            _chart.setFilter(null);
+            _chart.brush().clear();
+        }
+        _chart.fadeDeselectedArea();
     };
 
     _chart.redrawBrush = function (g) {