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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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