@@ -970,12 +970,6 @@ dc.coordinateGridChart = function(_chart) {
970
970
return _chart ;
971
971
} ;
972
972
973
- _chart . _filter = function ( _ ) {
974
- if ( ! arguments . length ) return _filter ;
975
- _filter = _ ;
976
- return _chart ;
977
- } ;
978
-
979
973
_chart . filter = function ( _ ) {
980
974
if ( ! arguments . length ) return _filter ;
981
975
@@ -1038,19 +1032,26 @@ dc.coordinateGridChart = function(_chart) {
1038
1032
1039
1033
_chart . redrawBrush ( _g ) ;
1040
1034
1041
- dc . events . trigger ( function ( ) {
1042
- _chart . filter ( _brush . empty ( ) ? null : [ extent [ 0 ] , extent [ 1 ] ] ) ;
1043
- dc . redrawAll ( _chart . chartGroup ( ) ) ;
1044
- } , dc . constants . EVENT_DELAY ) ;
1035
+ if ( _brush . empty ( ) ) {
1036
+ dc . events . trigger ( function ( ) {
1037
+ _chart . filter ( null ) ;
1038
+ dc . redrawAll ( _chart . chartGroup ( ) ) ;
1039
+ } ) ;
1040
+ } else {
1041
+ dc . events . trigger ( function ( ) {
1042
+ _chart . filter ( [ extent [ 0 ] , extent [ 1 ] ] ) ;
1043
+ dc . redrawAll ( _chart . chartGroup ( ) ) ;
1044
+ } , dc . constants . EVENT_DELAY ) ;
1045
+ }
1045
1046
}
1046
1047
1047
1048
function brushEnd ( p ) {
1048
1049
}
1049
1050
1050
1051
_chart . redrawBrush = function ( g ) {
1051
1052
if ( _brushOn ) {
1052
- if ( _chart . _filter ( ) && _chart . brush ( ) . empty ( ) )
1053
- _chart . brush ( ) . extent ( _chart . _filter ( ) ) ;
1053
+ if ( _chart . filter ( ) && _chart . brush ( ) . empty ( ) )
1054
+ _chart . brush ( ) . extent ( _chart . filter ( ) ) ;
1054
1055
1055
1056
var gBrush = g . select ( "g.brush" ) ;
1056
1057
gBrush . call ( _chart . brush ( ) . x ( _chart . x ( ) ) ) ;
0 commit comments