fix(services): fix providers for root, correctly apply another themes

This commit is contained in:
Dmitry Nehaychik 2016-10-04 12:36:08 +03:00
parent bcae560f3b
commit 40aa2ed0ae
3 changed files with 16 additions and 9 deletions

View file

@ -3,6 +3,7 @@ import { Component, ViewEncapsulation } from '@angular/core';
import { GlobalState } from './global.state'; import { GlobalState } from './global.state';
import { BaImageLoaderService, BaThemePreloader, BaThemeSpinner } from './theme/services'; import { BaImageLoaderService, BaThemePreloader, BaThemeSpinner } from './theme/services';
import { layoutPaths } from './theme/theme.constants'; import { layoutPaths } from './theme/theme.constants';
import { BaThemeConfig } from './theme/theme.config';
/* /*
* App Component * App Component
@ -25,7 +26,8 @@ export class App {
constructor(private _state: GlobalState, constructor(private _state: GlobalState,
private _imageLoader: BaImageLoaderService, private _imageLoader: BaImageLoaderService,
private _spinner: BaThemeSpinner) { private _spinner: BaThemeSpinner,
private _config:BaThemeConfig) {
this._loadImages(); this._loadImages();

View file

@ -44,7 +44,7 @@ type StoreType = {
RouterModule, RouterModule,
FormsModule, FormsModule,
ReactiveFormsModule, ReactiveFormsModule,
NgaModule, NgaModule.forRoot(),
PagesModule, PagesModule,
routing routing
], ],

View file

@ -1,4 +1,4 @@
import { NgModule } from '@angular/core'; import { NgModule, ModuleWithProviders } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { ReactiveFormsModule, FormsModule } from '@angular/forms'; import { ReactiveFormsModule, FormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
@ -106,12 +106,6 @@ const NGA_VALIDATORS = [
FormsModule, FormsModule,
ReactiveFormsModule, ReactiveFormsModule,
], ],
providers: [
BaThemeConfigProvider,
BaThemeConfig,
...NGA_VALIDATORS,
...NGA_SERVICES
],
exports: [ exports: [
...NGA_PIPES, ...NGA_PIPES,
...NGA_DIRECTIVES, ...NGA_DIRECTIVES,
@ -119,4 +113,15 @@ const NGA_VALIDATORS = [
] ]
}) })
export class NgaModule { export class NgaModule {
static forRoot(): ModuleWithProviders {
return <ModuleWithProviders> {
ngModule: NgaModule,
providers: [
BaThemeConfigProvider,
BaThemeConfig,
...NGA_VALIDATORS,
...NGA_SERVICES
],
};
}
} }