feat(filterFilter): pass index to function predicate

colincasey · btford · commit 46343c603db6 · 2014-08-28T12:34:42.000-07:00
Closes angular#654
diff --git a/src/ng/filter/filter.js b/src/ng/filter/filter.js
@@ -25,9 +25,9 @@
  *     property of the object. That's equivalent to the simple substring match with a `string`
  *     as described above.
  *
- *   - `function(value)`: A predicate function can be used to write arbitrary filters. The function is
- *     called for each element of `array`. The final result is an array of those elements that
- *     the predicate returned true for.
+ *   - `function(value, index)`: A predicate function can be used to write arbitrary filters. The
+ *     function is called for each element of `array`. The final result is an array of those
+ *     elements that the predicate returned true for.
  *
  * @param {function(actual, expected)|true|undefined} comparator Comparator which is used in
  *     determining if the expected value (from the filter expression) and actual value (from
@@ -120,9 +120,9 @@ function filterFilter() {
     var comparatorType = typeof(comparator),
         predicates = [];
 
-    predicates.check = function(value) {
+    predicates.check = function(value, index) {
       for (var j = 0; j < predicates.length; j++) {
-        if(!predicates[j](value)) {
+        if(!predicates[j](value, index)) {
           return false;
         }
       }
@@ -211,7 +211,7 @@ function filterFilter() {
     var filtered = [];
     for ( var j = 0; j < array.length; j++) {
       var value = array[j];
-      if (predicates.check(value)) {
+      if (predicates.check(value, j)) {
         filtered.push(value);
       }
     }
diff --git a/test/ng/filter/filterSpec.js b/test/ng/filter/filterSpec.js
@@ -49,6 +49,16 @@ describe('Filter: filter', function() {
     expect(filter(items, function(i) {return i.done;}).length).toBe(1);
   });
 
+  it('should pass the index to a function predicate', function() {
+    var items = [0, 1, 2, 3];
+
+    var result = filter(items, function(value, index) {
+      return index % 2 === 0;
+    });
+
+    expect(result).toEqual([0, 2]);
+  });
+
   it('should take object as predicate', function() {
     var items = [{first: 'misko', last: 'hevery'},
                  {first: 'adam', last: 'abrons'}];

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@`
`25`	`25`	* property of the object. That's equivalent to the simple substring match with a `string`
`26`	`26`	`* as described above.`
`27`	`27`	`*`
`28`		- * - `function(value)`: A predicate function can be used to write arbitrary filters. The function is
`29`		- * called for each element of `array`. The final result is an array of those elements that
`30`		`- * the predicate returned true for.`
	`28`	+ * - `function(value, index)`: A predicate function can be used to write arbitrary filters. The
	`29`	+ * function is called for each element of `array`. The final result is an array of those
	`30`	`+ * elements that the predicate returned true for.`
`31`	`31`	`*`
`32`	`32`	`* @param {function(actual, expected)\|true\|undefined} comparator Comparator which is used in`
`33`	`33`	`* determining if the expected value (from the filter expression) and actual value (from`
`@@ -120,9 +120,9 @@ function filterFilter() {`
`120`	`120`	`var comparatorType = typeof(comparator),`
`121`	`121`	`predicates = [];`
`122`	`122`
`123`		`- predicates.check = function(value) {`
	`123`	`+ predicates.check = function(value, index) {`
`124`	`124`	`for (var j = 0; j < predicates.length; j++) {`
`125`		`- if(!predicates[j](value)) {`
	`125`	`+ if(!predicates[j](value, index)) {`
`126`	`126`	`return false;`
`127`	`127`	`}`
`128`	`128`	`}`
`@@ -211,7 +211,7 @@ function filterFilter() {`
`211`	`211`	`var filtered = [];`
`212`	`212`	`for ( var j = 0; j < array.length; j++) {`
`213`	`213`	`var value = array[j];`
`214`		`- if (predicates.check(value)) {`
	`214`	`+ if (predicates.check(value, j)) {`
`215`	`215`	`filtered.push(value);`
`216`	`216`	`}`
`217`	`217`	`}`