lodash#274 Fix bug with filtering limited collection. Renamed 'o.fini…

…shed' to 'o.running'.
FilipZawada · Aug 5, 2014 · 19b828a · 19b828a
1 parent 5b3a490
commit 19b828a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/lodash.js b/lodash.js
@@ -4427,7 +4427,7 @@
       count = count || 1;
 
       this.funcs.push(function (o) {
-        return (o.finished = (--count <= 0))
+        return (o.running = (--count > 0));
       });
 
       if(this.filterApplied) {
@@ -4468,17 +4468,17 @@
           source = this.source,
           dir = this.dir,
           result = [],
-          o = {},
+          o = { running: true },
           resultIndex = 0,
           min = this.min,
           max = this.max,
           sourceIndex = (dir == 1 ? min : max);
 
-      while(!o.finished && sourceIndex >= min && sourceIndex <= max)
+      while(o.running && sourceIndex >= min && sourceIndex <= max)
       {
         o.value = source[sourceIndex];
         o.accepted = true;
-        o.finished = false;
+        o.running = true;
 
         sourceIndex += dir;
 

diff --git a/test/test-lazy.js b/test/test-lazy.js
@@ -640,6 +640,7 @@
     QUnit.module('lodash.lazy.value');
 
     (function() {
+      function isEven(x) { return x % 2 == 0; }
 
       test("should return original collection", 1, function() {
         var collection = [1, 2, 3];
@@ -693,6 +694,14 @@
 
         deepEqual(actual, [2, 4]);
       });
+
+      test("should filter already limited collection", 1, function () {
+        var collection = [1, 2, 3, 4];
+
+        var actual = _.lazy(collection).take(2).filter(isEven).value()
+
+        deepEqual(actual, [2]);
+      });
     })();