From b8fb2df231a1e31b7c43d43ba0116c14bf93199b Mon Sep 17 00:00:00 2001
From: Gareth Smith <garethdanielsmith@gmail.com>
Date: Tue, 1 Mar 2016 10:12:26 +0000
Subject: [PATCH] Allow IFilterOptions.condition to be set to a function, as
 the documentation describes.

---
 ui-grid/ui-grid-tests.ts | 3 +++
 ui-grid/ui-grid.d.ts     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui-grid/ui-grid-tests.ts b/ui-grid/ui-grid-tests.ts
index e89f180b92..5376e6aaae 100644
--- a/ui-grid/ui-grid-tests.ts
+++ b/ui-grid/ui-grid-tests.ts
@@ -41,6 +41,9 @@ columnDef.filter = {
     selectOptions: [{value: 4, label: 'test'}],
     disableCancelButton: false
 };
+columnDef.filter.condition = (searchTerm:string, cellValue:any, row:uiGrid.IGridRow, column:uiGrid.IGridColumn):boolean => {
+    return true;
+};
 columnDef.filterCellFiltered = false;
 columnDef.filterHeaderTemplate = '<div blah="test"></div>';
 columnDef.filters = [columnDef.filter];
diff --git a/ui-grid/ui-grid.d.ts b/ui-grid/ui-grid.d.ts
index bd0ecd835c..11786da15f 100644
--- a/ui-grid/ui-grid.d.ts
+++ b/ui-grid/ui-grid.d.ts
@@ -3844,7 +3844,7 @@ declare module uiGrid {
          * or you can supply a custom filter function that gets passed the
          * following arguments: [searchTerm, cellValue, row, column].
          */
-        condition?: number;
+        condition?: number | ((searchTerm:string, cellValue:any, row:IGridRow, column:IGridColumn) => boolean);
         /**
          * If set, the filter field will be pre-populated with this value
          */