artifacts

dc-js · Jul 7, 2014 · ae7791a · ae7791a
1 parent d387042
commit ae7791a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/dc.js b/dc.js
@@ -611,7 +611,7 @@ dc.baseMixin = function (_chart) {
                     var filter = filters[i];
                     if (filter.isFiltered && filter.isFiltered(d)) {
                         return true;
-                    } else if (filter == d) {
+                    } else if (filter <= d && filter >= d) {
                         return true;
                     }
                 }
@@ -1007,11 +1007,18 @@ dc.baseMixin = function (_chart) {
     **/
     _chart.hasFilter = function (filter) {
         if (!arguments.length) return _filters.length > 0;
-        return _filters.indexOf(filter) >= 0;
+        return _filters.some(function(f) {
+            return filter <= f && filter >= f;
+        });
     };
 
     function removeFilter(_) {
-        _filters.splice(_filters.indexOf(_), 1);
+        for(var i = 0; i < _filters.length; i++) {
+            if(_filters[i] <= _ && _filters[i] >= _) {
+                _filters.splice(i, 1);
+                break;
+            }
+        }
         applyFilters();
         _chart._invokeFilteredListener(_);
     }

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/web/js/dc.js b/web/js/dc.js
@@ -611,7 +611,7 @@ dc.baseMixin = function (_chart) {
                     var filter = filters[i];
                     if (filter.isFiltered && filter.isFiltered(d)) {
                         return true;
-                    } else if (filter == d) {
+                    } else if (filter <= d && filter >= d) {
                         return true;
                     }
                 }
@@ -1007,11 +1007,18 @@ dc.baseMixin = function (_chart) {
     **/
     _chart.hasFilter = function (filter) {
         if (!arguments.length) return _filters.length > 0;
-        return _filters.indexOf(filter) >= 0;
+        return _filters.some(function(f) {
+            return filter <= f && filter >= f;
+        });
     };
 
     function removeFilter(_) {
-        _filters.splice(_filters.indexOf(_), 1);
+        for(var i = 0; i < _filters.length; i++) {
+            if(_filters[i] <= _ && _filters[i] >= _) {
+                _filters.splice(i, 1);
+                break;
+            }
+        }
         applyFilters();
         _chart._invokeFilteredListener(_);
     }