From 00b3654f9d15e4f1eca709f903c47484383b8407 Mon Sep 17 00:00:00 2001 From: Ghislain B Date: Tue, 27 Feb 2018 23:43:41 -0500 Subject: [PATCH] fix(filter): remove unused function --- .../src/aurelia-slickgrid/services/filter.service.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/aurelia-slickgrid/src/aurelia-slickgrid/services/filter.service.ts b/aurelia-slickgrid/src/aurelia-slickgrid/services/filter.service.ts index e63915f1e..0e78b072a 100644 --- a/aurelia-slickgrid/src/aurelia-slickgrid/services/filter.service.ts +++ b/aurelia-slickgrid/src/aurelia-slickgrid/services/filter.service.ts @@ -142,7 +142,6 @@ export class FilterService { const columnIndex = args.grid.getColumnIndex(columnId); const columnDef = args.grid.getColumns()[columnIndex]; const fieldType = columnDef.type || FieldType.string; - const conditionalFilterFn = (columnDef.filter && columnDef.filter.conditionalFilter) ? columnDef.filter.conditionalFilter : null; const filterSearchType = (columnDef.filterSearchType) ? columnDef.filterSearchType : null; let cellValue = item[columnDef.queryField || columnDef.field]; @@ -212,9 +211,7 @@ export class FilterService { cellValueLastChar: lastValueChar, filterSearchType }; - if (conditionalFilterFn && typeof conditionalFilterFn === 'function') { - conditionalFilterFn(conditionOptions); - } + if (!FilterConditions.executeMappedCondition(conditionOptions)) { return false; }