Fix issue with updating index after removing data.

Fixes #89.
square · Sep 2, 2013 · 60169ab · 60169ab
1 parent 89bc6c3
commit 60169ab
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -16,6 +16,7 @@ crossfilter.js: \
 	src/zero.js \
 	src/reduce.js \
 	src/crossfilter.js \
+	package.json \
 	Makefile
 
 %.min.js: %.js Makefile

diff --git a/crossfilter.js b/crossfilter.js
@@ -1,5 +1,5 @@
 (function(exports){
-crossfilter.version = "1.3.0";
+crossfilter.version = "1.3.1";
 function crossfilter_identity(d) {
   return d;
 }
@@ -698,9 +698,8 @@ function crossfilter() {
 
     function removeData(reIndex) {
       for (var i = 0, j = 0, k; i < n; ++i) {
-        if (filters[k = index[i]] && i !== j) {
-          values[j] = values[i];
-          index[j] = reIndex[k];
+        if (filters[k = index[i]]) {
+          if (i !== j) values[j] = values[i], index[j] = reIndex[k];
           ++j;
         }
       }

diff --git a/crossfilter.min.js b/crossfilter.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crossfilter",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Fast multidimensional filtering for coordinated views.",
   "keywords": [
     "square",

diff --git a/src/crossfilter.js b/src/crossfilter.js
@@ -183,9 +183,8 @@ function crossfilter() {
 
     function removeData(reIndex) {
       for (var i = 0, j = 0, k; i < n; ++i) {
-        if (filters[k = index[i]] && i !== j) {
-          values[j] = values[i];
-          index[j] = reIndex[k];
+        if (filters[k = index[i]]) {
+          if (i !== j) values[j] = values[i], index[j] = reIndex[k];
           ++j;
         }
       }

diff --git a/test/crossfilter-test.js b/test/crossfilter-test.js
@@ -913,6 +913,13 @@ suite.addBatch({
         data.remove();
         assert.deepEqual(data.foo.top(Infinity), []);
         assert.deepEqual(data.foo.evenOdd.all(), [{key: 0, value: 0}, {key: 1, value: 0}]);
+      },
+      "filtering works correctly after removing a record": function(data) {
+        data.add([{foo: 1}, {foo: 2}, {foo: 3}]);
+        data.foo.filter(2);
+        data.remove();
+        data.foo.filter(null);
+        assert.deepEqual(data.foo.top(Infinity), [{foo: 3}, {foo: 1}]);
       }
     }
   }