MOBILE-2302 core: Fix providers instantiated several times

main
Dani Palou 2017-12-11 09:21:01 +01:00
parent cda02ff68e
commit fe5af52d43
11 changed files with 3 additions and 21 deletions

View File

@ -54,6 +54,7 @@ import { CoreUpdateManagerProvider } from '../providers/update-manager';
import { CorePluginFileDelegate } from '../providers/plugin-file-delegate';
import { CoreLoginModule } from '../core/login/login.module';
import { CoreMainMenuModule } from '../core/mainmenu/mainmenu.module';
// For translate loader. AoT requires an exported function for factories.
export function createTranslateLoader(http: HttpClient) {
@ -79,7 +80,8 @@ export function createTranslateLoader(http: HttpClient) {
}
}),
CoreEmulatorModule,
CoreLoginModule
CoreLoginModule,
CoreMainMenuModule
],
bootstrap: [IonicApp],
entryComponents: [

View File

@ -15,7 +15,6 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { CoreLoginCredentialsPage } from './credentials';
import { CoreLoginModule } from '../../login.module';
import { TranslateModule } from '@ngx-translate/core';
import { CoreComponentsModule } from '../../../../components/components.module';
import { CoreDirectivesModule } from '../../../../directives/directives.module';
@ -27,7 +26,6 @@ import { CoreDirectivesModule } from '../../../../directives/directives.module';
imports: [
CoreComponentsModule,
CoreDirectivesModule,
CoreLoginModule,
IonicPageModule.forChild(CoreLoginCredentialsPage),
TranslateModule.forChild()
]

View File

@ -15,7 +15,6 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { CoreLoginEmailSignupPage } from './email-signup';
import { CoreLoginModule } from '../../login.module';
import { TranslateModule } from '@ngx-translate/core';
import { CoreComponentsModule } from '../../../../components/components.module';
import { CoreDirectivesModule } from '../../../../directives/directives.module';
@ -27,7 +26,6 @@ import { CoreDirectivesModule } from '../../../../directives/directives.module';
imports: [
CoreComponentsModule,
CoreDirectivesModule,
CoreLoginModule,
IonicPageModule.forChild(CoreLoginEmailSignupPage),
TranslateModule.forChild()
]

View File

@ -15,7 +15,6 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { CoreLoginForgottenPasswordPage } from './forgotten-password';
import { CoreLoginModule } from '../../login.module';
import { TranslateModule } from '@ngx-translate/core';
@NgModule({
@ -23,7 +22,6 @@ import { TranslateModule } from '@ngx-translate/core';
CoreLoginForgottenPasswordPage
],
imports: [
CoreLoginModule,
IonicPageModule.forChild(CoreLoginForgottenPasswordPage),
TranslateModule.forChild()
]

View File

@ -15,14 +15,12 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { CoreLoginInitPage } from './init';
import { CoreLoginModule } from '../../login.module';
@NgModule({
declarations: [
CoreLoginInitPage,
],
imports: [
CoreLoginModule,
IonicPageModule.forChild(CoreLoginInitPage),
],
})

View File

@ -16,7 +16,6 @@ import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { TranslateModule } from '@ngx-translate/core';
import { CoreLoginReconnectPage } from './reconnect';
import { CoreLoginModule } from '../../login.module';
import { CoreComponentsModule } from '../../../../components/components.module';
import { CoreDirectivesModule } from '../../../../directives/directives.module';
@ -27,7 +26,6 @@ import { CoreDirectivesModule } from '../../../../directives/directives.module';
imports: [
CoreComponentsModule,
CoreDirectivesModule,
CoreLoginModule,
IonicPageModule.forChild(CoreLoginReconnectPage),
TranslateModule.forChild()
]

View File

@ -15,7 +15,6 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { CoreLoginSitePolicyPage } from './site-policy';
import { CoreLoginModule } from '../../login.module';
import { TranslateModule } from '@ngx-translate/core';
import { CoreComponentsModule } from '../../../../components/components.module';
import { CoreDirectivesModule } from '../../../../directives/directives.module';
@ -27,7 +26,6 @@ import { CoreDirectivesModule } from '../../../../directives/directives.module';
imports: [
CoreComponentsModule,
CoreDirectivesModule,
CoreLoginModule,
IonicPageModule.forChild(CoreLoginSitePolicyPage),
TranslateModule.forChild()
]

View File

@ -15,7 +15,6 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { CoreLoginSitePage } from './site';
import { CoreLoginModule } from '../../login.module';
import { TranslateModule } from '@ngx-translate/core';
import { CoreDirectivesModule } from '../../../../directives/directives.module';
@ -25,7 +24,6 @@ import { CoreDirectivesModule } from '../../../../directives/directives.module';
],
imports: [
CoreDirectivesModule,
CoreLoginModule,
IonicPageModule.forChild(CoreLoginSitePage),
TranslateModule.forChild()
]

View File

@ -16,7 +16,6 @@ import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { TranslateModule } from '@ngx-translate/core';
import { CoreLoginSitesPage } from './sites';
import { CoreLoginModule } from '../../login.module';
import { CoreDirectivesModule } from '../../../../directives/directives.module';
@NgModule({
@ -25,7 +24,6 @@ import { CoreDirectivesModule } from '../../../../directives/directives.module';
],
imports: [
CoreDirectivesModule,
CoreLoginModule,
IonicPageModule.forChild(CoreLoginSitesPage),
TranslateModule.forChild()
],

View File

@ -16,14 +16,12 @@ import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { TranslateModule } from '@ngx-translate/core';
import { CoreMainMenuPage } from './menu';
import { CoreMainMenuModule } from '../../mainmenu.module';
@NgModule({
declarations: [
CoreMainMenuPage,
],
imports: [
CoreMainMenuModule,
IonicPageModule.forChild(CoreMainMenuPage),
TranslateModule.forChild()
],

View File

@ -16,7 +16,6 @@ import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { TranslateModule } from '@ngx-translate/core';
import { CoreMainMenuMorePage } from './more';
import { CoreMainMenuModule } from '../../mainmenu.module';
import { CoreComponentsModule } from '../../../../components/components.module';
import { CoreDirectivesModule } from '../../../../directives/directives.module';
@ -27,7 +26,6 @@ import { CoreDirectivesModule } from '../../../../directives/directives.module';
imports: [
CoreComponentsModule,
CoreDirectivesModule,
CoreMainMenuModule,
IonicPageModule.forChild(CoreMainMenuMorePage),
TranslateModule.forChild()
],