diff --git a/aurelia-slickgrid/src/aurelia-slickgrid/aurelia-slickgrid.ts b/aurelia-slickgrid/src/aurelia-slickgrid/aurelia-slickgrid.ts index b6d983c76..71f393971 100644 --- a/aurelia-slickgrid/src/aurelia-slickgrid/aurelia-slickgrid.ts +++ b/aurelia-slickgrid/src/aurelia-slickgrid/aurelia-slickgrid.ts @@ -42,7 +42,7 @@ import { FilterService, GraphqlService, GridEventService, - GridExtraService, + GridService, GridStateService, GroupingAndColspanService, ResizerService, @@ -67,7 +67,7 @@ const eventPrefix = 'sg'; FilterService, GraphqlService, GridEventService, - GridExtraService, + GridService, GridStateService, GroupingAndColspanService, I18N, @@ -107,7 +107,7 @@ export class AureliaSlickgridCustomElement { private filterService: FilterService, private graphqlService: GraphqlService, private gridEventService: GridEventService, - private gridExtraService: GridExtraService, + private gridService: GridService, private gridStateService: GridStateService, private groupingAndColspanService: GroupingAndColspanService, private i18n: I18N, @@ -172,8 +172,8 @@ export class AureliaSlickgridCustomElement { this.groupingAndColspanService.init(this.grid, this.dataview); } - // attach grid extra service - this.gridExtraService.init(this.grid, this.dataview); + // initialize grid service + this.gridService.init(this.grid, this.dataview); // when user enables translation, we need to translate Headers on first pass & subsequently in the attachDifferentHooks if (this.gridOptions.enableTranslate) { @@ -200,7 +200,7 @@ export class AureliaSlickgridCustomElement { filterService: this.filterService, gridEventService: this.gridEventService, gridStateService: this.gridStateService, - gridService: this.gridExtraService, + gridService: this.gridService, groupingService: this.groupingAndColspanService, pluginService: this.controlAndPluginService, resizerService: this.resizer, diff --git a/aurelia-slickgrid/src/aurelia-slickgrid/index.ts b/aurelia-slickgrid/src/aurelia-slickgrid/index.ts index cc4a21dd7..a9d8c8689 100644 --- a/aurelia-slickgrid/src/aurelia-slickgrid/index.ts +++ b/aurelia-slickgrid/src/aurelia-slickgrid/index.ts @@ -5,20 +5,6 @@ import { SlickgridConfig } from './slickgrid-config'; import { Filters, PLUGIN_NAME as FILTER_PLUGIN_NAME } from './filters/index'; const SERVICE_NAME = 'AURELIA__SLICKGRID_SERVICES'; -// expose all public classes -// aggregators, editors, formatters, services... -export * from './models/index'; -export * from './formatters/index'; -export * from './grouping-formatters/index'; -export * from './sorters/index'; - -export * from './aggregators/index'; -export * from './editors/index'; -export * from './filter-conditions/index'; -export * from './filters/index'; - -export { GridExtraUtils, GraphqlService, GridOdataService } from './services/index'; - // import all Services separately import { CollectionService, @@ -27,7 +13,7 @@ import { FilterService, GraphqlService, GridEventService, - GridExtraService, + GridService, GridExtraUtils, GridStateService, GridOdataService, @@ -37,6 +23,25 @@ import { SortService, } from './services/index'; +// expose all public classes +// aggregators, editors, formatters, services... +export * from './models/index'; +export * from './formatters/index'; +export * from './grouping-formatters/index'; +export * from './sorters/index'; + +export * from './aggregators/index'; +export * from './editors/index'; +export * from './filter-conditions/index'; +export * from './filters/index'; + +// export some of the Services +export { + GridExtraUtils, + GraphqlService, + GridOdataService +} from './services/index'; + export function configure(aurelia: any, callback: any) { aurelia.globalResources(PLATFORM.moduleName('./aurelia-slickgrid')); aurelia.globalResources(PLATFORM.moduleName('./slick-pagination')); @@ -55,7 +60,7 @@ export function configure(aurelia: any, callback: any) { aurelia.container.registerTransient(SERVICE_NAME, FilterService); aurelia.container.registerTransient(SERVICE_NAME, GraphqlService); aurelia.container.registerTransient(SERVICE_NAME, GridEventService); - aurelia.container.registerTransient(SERVICE_NAME, GridExtraService); + aurelia.container.registerTransient(SERVICE_NAME, GridService); aurelia.container.registerTransient(SERVICE_NAME, GridStateService); aurelia.container.registerTransient(SERVICE_NAME, GridOdataService); aurelia.container.registerTransient(SERVICE_NAME, GroupingAndColspanService); diff --git a/aurelia-slickgrid/src/aurelia-slickgrid/services/gridExtra.service.ts b/aurelia-slickgrid/src/aurelia-slickgrid/services/grid.service.ts similarity index 99% rename from aurelia-slickgrid/src/aurelia-slickgrid/services/gridExtra.service.ts rename to aurelia-slickgrid/src/aurelia-slickgrid/services/grid.service.ts index 886ff527e..96d53bbba 100644 --- a/aurelia-slickgrid/src/aurelia-slickgrid/services/gridExtra.service.ts +++ b/aurelia-slickgrid/src/aurelia-slickgrid/services/grid.service.ts @@ -4,7 +4,7 @@ import * as $ from 'jquery'; // using external non-typed js libraries declare var Slick: any; -export class GridExtraService { +export class GridService { private _grid: any; private _dataView: any;