fix(filterFilter): let expression object {$: '...'} also match primitive items

Closes angular#10428

Author: gkalpak

src/ng/filter/filter.js

@@ -133,6 +133,11 @@ function filterFilter() {
         //jshint -W086
       case 'object':
         //jshint +W086
+        if (!matchAgainstAnyProp && (expression !== null) && ('$' in expression)) {
+          expression = expression.$;
+          matchAgainstAnyProp = true;
+        }
+
         predicateFn = createPredicateFn(expression, comparator, matchAgainstAnyProp);
         break;
       default:

test/ng/filter/filterSpec.js

@@ -65,6 +65,28 @@ describe('Filter: filter', function() {
   });
 
 
+  it('should match primitive array values against top-level `$` property in object expression',
+    function() {
+      var items, expr;
+
+      items = ['something', 'something else', 'another thing'];
+      expr = {$: 'some'};
+      expect(filter(items, expr).length).toBe(2);
+      expect(filter(items, expr)).toEqual([items[0], items[1]]);
+
+      items = [{val: 'something'}, {val: 'something else'}, {val: 'another thing'}];
+      expr = {$: 'some'};
+      expect(filter(items, expr).length).toBe(2);
+      expect(filter(items, expr)).toEqual([items[0], items[1]]);
+
+      items = [123, 456, 789];
+      expr = {$: 1};
+      expect(filter(items, expr).length).toBe(1);
+      expect(filter(items, expr)).toEqual([items[0]]);
+    }
+  );
+
+
   it('should take object as predicate', function() {
     var items = [{first: 'misko', last: 'hevery'},
                  {first: 'adam', last: 'abrons'}];
@@ -313,8 +335,6 @@ describe('Filter: filter', function() {
     expect(filter(items, {}).length).toBe(1);
     expect(filter(items, {})[0]).toBe(items[1]);
 
-    expect(filter(items, {$: 'll'}).length).toBe(0);
-
     // Not affected by `Object.prototype`
     expect(filter(items, 'll').length).toBe(1);
     expect(filter(items, 'll')[0]).toBe(items[0]);