refactor(code): remove deprecated FormElementType

ghiscoding · May 26, 2018 · 895474a · 895474a
1 parent 532554d
commit 895474a
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 34 deletions.
diff --git a/aurelia-slickgrid/src/aurelia-slickgrid/aurelia-slickgrid.ts b/aurelia-slickgrid/src/aurelia-slickgrid/aurelia-slickgrid.ts
@@ -28,7 +28,6 @@ import {
   BackendServiceOption,
   CellArgs,
   Column,
-  FormElementType,
   GraphqlResult,
   GridOption,
   GridStateChange,

diff --git a/aurelia-slickgrid/src/aurelia-slickgrid/filters/filterFactory.ts b/aurelia-slickgrid/src/aurelia-slickgrid/filters/filterFactory.ts
@@ -1,5 +1,5 @@
 import { inject, Container } from 'aurelia-framework';
-import { Filter, FilterType, FormElementType } from '../models/index';
+import { Filter, FilterType } from '../models/index';
 import { SlickgridConfig } from '../slickgrid-config';
 
 /** The name of the plugins the factory will initialize */
@@ -26,11 +26,11 @@ export class FilterFactory {
 
   /**
    * Creates a new Filter from the provided filterType
-   * @param {FilterType | FormElementType | string} [filterType] the type of filter to create
+   * @param {FilterType | string} [filterType] the type of filter to create
    * as an enum or custom string. The default filter type will be used if no value is passed
    * @return {Filter} the new Filter
    */
-  public createFilter(filterType?: FilterType | FormElementType | string): Filter {
+  public createFilter(filterType?: FilterType | string): Filter {
     const filters = this.container.getAll(PLUGIN_NAME);
 
     let filter: Filter | undefined = filters.find((f: Filter) =>

diff --git a/aurelia-slickgrid/src/aurelia-slickgrid/models/columnFilter.interface.ts b/aurelia-slickgrid/src/aurelia-slickgrid/models/columnFilter.interface.ts
@@ -4,7 +4,6 @@ import {
   Column,
   Filter,
   FilterType,
-  FormElementType,
   MultipleSelectOption,
   OperatorString,
   OperatorType,
@@ -34,7 +33,7 @@ export interface ColumnFilter {
   operator?: OperatorType | OperatorString;
 
   /** Filter Type to use (input, multipleSelect, singleSelect, select, custom) */
-  type?: FilterType | FormElementType | string;
+  type?: FilterType | string;
 
   /** A collection of items/options (commonly used with a Select/Multi-Select Filter) */
   collection?: any[];

diff --git a/aurelia-slickgrid/src/aurelia-slickgrid/models/formElementType.ts b/aurelia-slickgrid/src/aurelia-slickgrid/models/formElementType.ts
diff --git a/aurelia-slickgrid/src/aurelia-slickgrid/models/index.ts b/aurelia-slickgrid/src/aurelia-slickgrid/models/index.ts
@@ -33,7 +33,6 @@ export * from './filterCondition.interface';
 export * from './filterConditionOption.interface';
 export * from './filterType.enum';
 export * from './formatter.interface';
-export * from './formElementType';
 export * from './graphqlDatasetFilter.interface';
 export * from './graphqlCursorPaginationOption.interface';
 export * from './graphqlFilteringOption.interface';

diff --git a/aurelia-slickgrid/src/aurelia-slickgrid/services/utilities.ts b/aurelia-slickgrid/src/aurelia-slickgrid/services/utilities.ts
@@ -1,4 +1,4 @@
-import { FieldType, OperatorType, FilterType, FormElementType } from '../models/index';
+import { FieldType, OperatorType, FilterType } from '../models/index';
 import * as moment from 'moment';
 
 /**
@@ -291,7 +291,7 @@ export function mapOperatorByFieldType(fieldType: FieldType | string): OperatorT
  * @param operator
  * @returns string map
  */
-export function mapOperatorByFilterType(filterType: FilterType | FormElementType | string): OperatorType {
+export function mapOperatorByFilterType(filterType: FilterType | string): OperatorType {
   let map = OperatorType.empty;
 
   switch (filterType) {

diff --git a/aurelia-slickgrid/src/examples/slickgrid/example7.ts b/aurelia-slickgrid/src/examples/slickgrid/example7.ts
@@ -1,5 +1,5 @@
 import { autoinject } from 'aurelia-framework';
-import { Column, GridOption, FieldType, Formatters, FormElementType } from '../../aurelia-slickgrid';
+import { Column, GridOption, FieldType, Formatters } from '../../aurelia-slickgrid';
 
 let columnsWithHighlightingById = {};
 

diff --git a/client-cli/src/examples/slickgrid/example5.js b/client-cli/src/examples/slickgrid/example5.js
@@ -1,6 +1,6 @@
 import { inject } from 'aurelia-framework';
 import { HttpClient } from 'aurelia-http-client';
-import { FieldType, FilterType, FormElementType, GridOdataService } from 'aurelia-slickgrid';
+import { FieldType, FilterType, GridOdataService } from 'aurelia-slickgrid';
 
 const defaultPageSize = 20;
 const sampleDataRoot = 'src/examples/slickgrid/sample-data';
@@ -52,7 +52,7 @@ export class Example5 {
         id: 'gender', name: 'Gender', field: 'gender', filterable: true, sortable: true, minWidth: 100,
         filter: {
           collection: [{ value: '', label: '' }, { value: 'male', label: 'male' }, { value: 'female', label: 'female' }],
-          type: FormElementType.singleSelect
+          type: FilterType.singleSelect
         }
       },
       { id: 'company', name: 'Company', field: 'company', minWidth: 100 }

diff --git a/client-cli/src/examples/slickgrid/example7.js b/client-cli/src/examples/slickgrid/example7.js
@@ -1,5 +1,5 @@
 import { autoinject } from 'aurelia-framework';
-import { Column, GridOption, Formatters, FormElementType } from 'aurelia-slickgrid';
+import { Column, GridOption, Formatters } from 'aurelia-slickgrid';
 
 let columnsWithHighlightingById = {};
 

diff --git a/doc/github-demo/src/examples/slickgrid/example5.ts b/doc/github-demo/src/examples/slickgrid/example5.ts
@@ -1,6 +1,6 @@
 import { autoinject } from 'aurelia-framework';
 import { HttpClient } from 'aurelia-http-client';
-import { CaseType, Column, GridOption, FieldType, FilterType, Formatters, FormElementType, GridOdataService, OperatorType } from 'aurelia-slickgrid';
+import { CaseType, Column, GridOption, FieldType, FilterType, Formatters, GridOdataService, OperatorType } from 'aurelia-slickgrid';
 
 const defaultPageSize = 20;
 const sampleDataRoot = 'assets/data';

diff --git a/doc/github-demo/src/examples/slickgrid/example7.ts b/doc/github-demo/src/examples/slickgrid/example7.ts
@@ -1,5 +1,5 @@
 import { autoinject } from 'aurelia-framework';
-import { Column, GridOption, FieldType, Formatters, FormElementType } from 'aurelia-slickgrid';
+import { Column, GridOption, FieldType, Formatters } from 'aurelia-slickgrid';
 
 let columnsWithHighlightingById = {};