From 25f942e70fe0744ff43bdd697495c46e786ed483 Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Fri, 3 Mar 2017 15:07:43 -0600 Subject: [PATCH] docs(e2e): lazy load modals in action-sheet/basic, alert/basic, app/cordova --- src/components/action-sheet/test/basic/app/app.module.ts | 6 +++++- .../action-sheet/test/basic/pages/page-one/page-one.ts | 4 +--- src/components/alert/test/basic/app/app.module.ts | 7 +++++-- src/components/alert/test/basic/pages/page-one/page-one.ts | 4 +--- src/components/app/test/cordova/app/app.module.ts | 1 + .../app/test/cordova/pages/page-two/page-two.module.ts | 4 +--- src/components/app/test/cordova/pages/page-two/page-two.ts | 4 +--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/components/action-sheet/test/basic/app/app.module.ts b/src/components/action-sheet/test/basic/app/app.module.ts index 5ebd4d5faa..2425dd19a5 100644 --- a/src/components/action-sheet/test/basic/app/app.module.ts +++ b/src/components/action-sheet/test/basic/app/app.module.ts @@ -12,7 +12,11 @@ import { PageOneModule } from '../pages/page-one/page-one.module'; ], imports: [ BrowserModule, - IonicModule.forRoot(AppComponent), + IonicModule.forRoot(AppComponent, {}, { + links: [ + { loadChildren: '../pages/modal-page/modal-page.module#ModalPageModule', name: 'modal-page' } + ] + }), ModalPageModule, PageOneModule ], diff --git a/src/components/action-sheet/test/basic/pages/page-one/page-one.ts b/src/components/action-sheet/test/basic/pages/page-one/page-one.ts index cdc65dfc73..d2851c4051 100644 --- a/src/components/action-sheet/test/basic/pages/page-one/page-one.ts +++ b/src/components/action-sheet/test/basic/pages/page-one/page-one.ts @@ -1,8 +1,6 @@ import { Component } from '@angular/core'; import { ActionSheetController, AlertController, ModalController, Platform } from '../../../../../..'; -import { ModalPage } from '../modal-page/modal-page'; - @Component({ templateUrl: 'page-one.html' }) @@ -39,7 +37,7 @@ export class PageOne { icon: 'arrow-dropright-circle', handler: () => { this.result = 'Play (open modal)'; - let modal = this.modalCtrl.create(ModalPage); + let modal = this.modalCtrl.create('modal-page'); modal.present(); // returning false does not allow the actionsheet to be closed diff --git a/src/components/alert/test/basic/app/app.module.ts b/src/components/alert/test/basic/app/app.module.ts index 100da8673d..fda3505abd 100644 --- a/src/components/alert/test/basic/app/app.module.ts +++ b/src/components/alert/test/basic/app/app.module.ts @@ -12,8 +12,11 @@ import { PageOneModule } from '../pages/page-one/page-one.module'; ], imports: [ BrowserModule, - IonicModule.forRoot(E2EApp), - ModalPageModule, + IonicModule.forRoot(E2EApp, {}, { + links: [ + { loadChildren: '../pages/modal-page/modal-page.module#ModalPageModule', name: 'modal-page'} + ] + }), PageOneModule ], bootstrap: [IonicApp] diff --git a/src/components/alert/test/basic/pages/page-one/page-one.ts b/src/components/alert/test/basic/pages/page-one/page-one.ts index 8d9e1a2eb6..7d826e26e4 100644 --- a/src/components/alert/test/basic/pages/page-one/page-one.ts +++ b/src/components/alert/test/basic/pages/page-one/page-one.ts @@ -1,8 +1,6 @@ import { Component } from '@angular/core'; import { AlertController, ModalController } from '../../../../../..'; -import { ModalPage } from '../modal-page/modal-page'; - @Component({ templateUrl: 'page-one.html' }) @@ -83,7 +81,7 @@ export class PageOne { alert.addButton({ text: 'Open Modal', handler: () => { - this.modalCtrl.create(ModalPage).present(); + this.modalCtrl.create('modal-page').present(); // do not close the alert when this button is pressed return false; diff --git a/src/components/app/test/cordova/app/app.module.ts b/src/components/app/test/cordova/app/app.module.ts index a0e62ea1b7..ffa43eed57 100644 --- a/src/components/app/test/cordova/app/app.module.ts +++ b/src/components/app/test/cordova/app/app.module.ts @@ -19,6 +19,7 @@ import { PageOneModule } from '../pages/page-one/page-one.module'; { name: 'page-three', loadChildren: '../pages/page-three/page-three.module#PageThreeModule'}, { name: 'tabs-page', loadChildren: '../pages/tabs/tabs-page.module#TabsPageModule'}, { name: 'tabs-page-one', loadChildren: '../pages/tabs-page-one/tabs-page-one.module#TabsPageOneModule'}, + { name: 'modal-page', loadChildren: '../pages/modal/modal.module#ModalPageModule'} ] }), PageOneModule diff --git a/src/components/app/test/cordova/pages/page-two/page-two.module.ts b/src/components/app/test/cordova/pages/page-two/page-two.module.ts index 80d26bcf50..d722c0ec14 100644 --- a/src/components/app/test/cordova/pages/page-two/page-two.module.ts +++ b/src/components/app/test/cordova/pages/page-two/page-two.module.ts @@ -2,15 +2,13 @@ import { NgModule } from '@angular/core'; import { DeepLinkModule } from '../../../../../..'; import { PageTwo } from './page-two'; -import { ModalPageModule } from '../modal/modal.module'; @NgModule({ declarations: [ PageTwo, ], imports: [ - DeepLinkModule.forChild(PageTwo), - ModalPageModule + DeepLinkModule.forChild(PageTwo) ], entryComponents: [ PageTwo, diff --git a/src/components/app/test/cordova/pages/page-two/page-two.ts b/src/components/app/test/cordova/pages/page-two/page-two.ts index 3b61a8d10e..f8aeb131ea 100644 --- a/src/components/app/test/cordova/pages/page-two/page-two.ts +++ b/src/components/app/test/cordova/pages/page-two/page-two.ts @@ -1,8 +1,6 @@ import { Component } from '@angular/core'; import { ModalController } from '../../../../../..'; -import { ModalPage } from '../modal/modal-page'; - @Component({ templateUrl: 'page-two.html' }) @@ -13,7 +11,7 @@ export class PageTwo { constructor(public modalCtrl: ModalController) {} openModal() { - const modal = this.modalCtrl.create(ModalPage); + const modal = this.modalCtrl.create('modal-page'); modal.present(); } }