From 2eb88fa6872c6ca9d500112259c0f005139d6140 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Wed, 1 Jun 2016 12:19:08 -0500 Subject: [PATCH] test(lifecycle): update lifecycle events --- src/components/alert/test/basic/index.ts | 8 +- src/components/alert/test/dismiss/index.ts | 2 +- src/components/loading/test/basic/index.ts | 2 +- src/components/modal/test/basic/index.ts | 72 ++++----- src/components/nav/test/basic/index.ts | 26 ++-- src/components/nav/test/memory/index.ts | 4 +- src/components/nav/test/routing/index.ts | 6 +- src/components/tabs/test/advanced/index.ts | 168 ++++++++++----------- 8 files changed, 144 insertions(+), 144 deletions(-) diff --git a/src/components/alert/test/basic/index.ts b/src/components/alert/test/basic/index.ts index ef686e2a6e..23e2050c44 100644 --- a/src/components/alert/test/basic/index.ts +++ b/src/components/alert/test/basic/index.ts @@ -284,12 +284,12 @@ class E2EPage { this.nav.present(alert); } - onPageDidLeave() { - console.log('E2EPage, onPageDidLeave'); + ionViewDidLeave() { + console.log('E2EPage, ionViewDidLeave'); } - onPageDidEnter() { - console.log('E2EPage, onPageDidEnter'); + ionViewDidEnter() { + console.log('E2EPage, ionViewDidEnter'); } } diff --git a/src/components/alert/test/dismiss/index.ts b/src/components/alert/test/dismiss/index.ts index a479c27bf7..be0148cae1 100644 --- a/src/components/alert/test/dismiss/index.ts +++ b/src/components/alert/test/dismiss/index.ts @@ -82,7 +82,7 @@ class AnotherPage { } } - onPageDidEnter() { + ionViewDidEnter() { this.showConfirm(); } diff --git a/src/components/loading/test/basic/index.ts b/src/components/loading/test/basic/index.ts index 2ad116ca65..6d572d4982 100644 --- a/src/components/loading/test/basic/index.ts +++ b/src/components/loading/test/basic/index.ts @@ -205,7 +205,7 @@ class E2EPage { class Page2 { constructor(private nav: NavController, private platform: Platform) {} - onPageLoaded() { + ionViewLoaded() { setTimeout(() => { this.nav.push(Page3); }, 1000); diff --git a/src/components/modal/test/basic/index.ts b/src/components/modal/test/basic/index.ts index ca339f5e3d..edbca00a3f 100644 --- a/src/components/modal/test/basic/index.ts +++ b/src/components/modal/test/basic/index.ts @@ -151,24 +151,24 @@ class ModalPassData { this.viewCtrl.dismiss(this.data); } - onPageLoaded(){ - console.log("ModalPassData onPageLoaded fired"); + ionViewLoaded(){ + console.log("ModalPassData ionViewLoaded fired"); } - onPageWillEnter(){ - console.log("ModalPassData onPagewillEnter fired"); + ionViewWillEnter(){ + console.log("ModalPassData ionViewWillEnter fired"); } - onPageDidEnter(){ - console.log("ModalPassData onPageDidEnter fired"); + ionViewDidEnter(){ + console.log("ModalPassData ionViewDidEnter fired"); } - onPageWillLeave(){ - console.log("ModalPassData onPageWillLeave fired"); + ionViewWillLeave(){ + console.log("ModalPassData ionViewWillLeave fired"); } - onPageDidLeave(){ - console.log("ModalPassData onPageDidLeave fired"); + ionViewDidLeave(){ + console.log("ModalPassData ionViewDidLeave fired"); } } @@ -266,26 +266,26 @@ class ContactUs { console.log('ContactUs constructor'); this.root = ModalFirstPage; } - onPageLoaded() { - console.log('ContactUs onPageLoaded'); + ionViewLoaded() { + console.log('ContactUs ionViewLoaded'); } - onPageWillEnter() { - console.log('ContactUs onPageWillEnter'); + ionViewWillEnter() { + console.log('ContactUs ionViewWillEnter'); } - onPageDidEnter() { - console.log('ContactUs onPageDidEnter'); + ionViewDidEnter() { + console.log('ContactUs ionViewDidEnter'); } - onPageWillLeave() { - console.log('ContactUs onPageWillLeave'); + ionViewWillLeave() { + console.log('ContactUs ionViewWillLeave'); } - onPageDidLeave() { - console.log('ContactUs onPageDidLeave'); + ionViewDidLeave() { + console.log('ContactUs ionViewDidLeave'); } - onPageWillUnload() { - console.log('ContactUs onPageWillUnload'); + ionViewWillUnload() { + console.log('ContactUs ionViewWillUnload'); } - onPageDidUnload() { - console.log('ContactUs onPageDidUnload'); + ionViewDidUnload() { + console.log('ContactUs ionViewDidUnload'); } } @@ -338,16 +338,16 @@ class ModalFirstPage { this.nav.rootNav.pop(); } - onPageLoaded(){ - console.log("ModalFirstPage OnPageLoaded fired"); + ionViewLoaded(){ + console.log("ModalFirstPage ionViewLoaded fired"); } - onPageWillEnter(){ - console.log("ModalFirstPage onPageWillEnter fired"); + ionViewWillEnter(){ + console.log("ModalFirstPage ionViewWillEnter fired"); } - onPageDidEnter(){ - console.log("ModalFirstPage onPageDidEnter fired"); + ionViewDidEnter(){ + console.log("ModalFirstPage ionViewDidEnter fired"); } openActionSheet() { @@ -417,16 +417,16 @@ class ModalSecondPage { console.log('Second page params:', params); } - onPageLoaded(){ - console.log("ModalSecondPage onPageLoaded"); + ionViewLoaded(){ + console.log("ModalSecondPage ionViewLoaded"); } - onPageWillEnter(){ - console.log("ModalSecondPage onPageWillEnter"); + ionViewWillEnter(){ + console.log("ModalSecondPage ionViewWillEnter"); } - onPageDidEnter(){ - console.log("ModalSecondPage onPageDidEnter"); + ionViewDidEnter(){ + console.log("ModalSecondPage ionViewDidEnter"); } } diff --git a/src/components/nav/test/basic/index.ts b/src/components/nav/test/basic/index.ts index 478fbd9e78..2c1bf10783 100644 --- a/src/components/nav/test/basic/index.ts +++ b/src/components/nav/test/basic/index.ts @@ -232,7 +232,7 @@ class PrimaryHeaderPage { private viewCtrl: ViewController ) {} - onPageWillEnter() { + ionViewWillEnter() { this.viewCtrl.setBackButtonText('Previous'); } @@ -337,28 +337,28 @@ class AnotherPage { ++this.bbCount; } - onPageWillEnter() { - console.log('Page, AnotherPage, onPageWillEnter', this.viewCtrl.id); + ionViewWillEnter() { + console.log('Page, AnotherPage, ionViewWillEnter', this.viewCtrl.id); } - onPageDidEnter() { - console.log('Page, AnotherPage, onPageDidEnter', this.viewCtrl.id); + ionViewDidEnter() { + console.log('Page, AnotherPage, ionViewDidEnter', this.viewCtrl.id); } - onPageWillLeave() { - console.log('Page, AnotherPage, onPageWillLeave', this.viewCtrl.id); + ionViewWillLeave() { + console.log('Page, AnotherPage, ionViewWillLeave', this.viewCtrl.id); } - onPageDidLeave() { - console.log('Page, AnotherPage, onPageDidLeave', this.viewCtrl.id); + ionViewDidLeave() { + console.log('Page, AnotherPage, ionViewDidLeave', this.viewCtrl.id); } - onPageWillUnload() { - console.log('Page, AnotherPage, onPageWillUnload', this.viewCtrl.id); + ionViewWillUnload() { + console.log('Page, AnotherPage, ionViewWillUnload', this.viewCtrl.id); } - onPageDidUnload() { - console.log('Page, AnotherPage, onPageDidUnload', this.viewCtrl.id); + ionViewDidUnload() { + console.log('Page, AnotherPage, ionViewDidUnload', this.viewCtrl.id); } ngOnDestroy() { diff --git a/src/components/nav/test/memory/index.ts b/src/components/nav/test/memory/index.ts index 4422d98392..d0af5d4555 100644 --- a/src/components/nav/test/memory/index.ts +++ b/src/components/nav/test/memory/index.ts @@ -31,7 +31,7 @@ class Page1 { }, delay); } - onPageDidEnter() { + ionViewDidEnter() { this.play(); } @@ -65,7 +65,7 @@ class Page2 { }, delay); } - onPageDidEnter() { + ionViewDidEnter() { this.play(); } diff --git a/src/components/nav/test/routing/index.ts b/src/components/nav/test/routing/index.ts index ac88d44b16..705bb5a5e6 100644 --- a/src/components/nav/test/routing/index.ts +++ b/src/components/nav/test/routing/index.ts @@ -14,7 +14,7 @@ class View1Cmp { console.log(`View1Cmp, path: ${this.path}`); } - onPageDidEnter() { + ionViewDidEnter() { this.windowHash = window.location.hash; } } @@ -30,7 +30,7 @@ class View2Cmp { console.log(`View2Cmp, path: ${this.path}`); } - onPageDidEnter() { + ionViewDidEnter() { this.windowHash = window.location.hash; } } @@ -48,7 +48,7 @@ class View3Cmp { console.log(`View3Cmp, path: ${this.path}, param id: ${this.id}`); } - onPageDidEnter() { + ionViewDidEnter() { this.windowHash = window.location.hash; } } diff --git a/src/components/tabs/test/advanced/index.ts b/src/components/tabs/test/advanced/index.ts index d21e818d95..aa849be5c9 100644 --- a/src/components/tabs/test/advanced/index.ts +++ b/src/components/tabs/test/advanced/index.ts @@ -51,12 +51,12 @@ class SignIn { class ChatPage { constructor(private viewCtrl: ViewController) {} - onPageDidLoad() { - console.log('ChatPage, onPageDidLoad'); + ionViewLoaded() { + console.log('ChatPage, ionViewLoaded'); } - onPageDidUnload() { - console.log('ChatPage, onPageDidUnload'); + ionViewDidUnload() { + console.log('ChatPage, ionViewDidUnload'); } } @@ -90,24 +90,24 @@ class TabsPage { this.nav.present(modal); } - onPageWillEnter() { - console.log('TabsPage, onPageWillEnter'); + ionViewWillEnter() { + console.log('TabsPage, ionViewWillEnter'); } - onPageDidEnter() { - console.log('TabsPage, onPageDidEnter'); + ionViewDidEnter() { + console.log('TabsPage, ionViewDidEnter'); } - onPageWillLeave() { - console.log('TabsPage, onPageWillLeave'); + ionViewWillLeave() { + console.log('TabsPage, ionViewWillLeave'); } - onPageDidLeave() { - console.log('TabsPage, onPageDidLeave'); + ionViewDidLeave() { + console.log('TabsPage, ionViewDidLeave'); } - onPageDidUnload() { - console.log('TabsPage, onPageDidUnload'); + ionViewDidUnload() { + console.log('TabsPage, ionViewDidUnload'); } } @@ -156,24 +156,24 @@ class Tab1Page1 { this.nav.rootNav.setRoot(SignIn, null, { animate: true, direction: 'back' }); } - onPageWillEnter() { - console.log('Tab1Page1, onPageWillEnter'); + ionViewWillEnter() { + console.log('Tab1Page1, ionViewWillEnter'); } - onPageDidEnter() { - console.log('Tab1Page1, onPageDidEnter'); + ionViewDidEnter() { + console.log('Tab1Page1, ionViewDidEnter'); } - onPageWillLeave() { - console.log('Tab1Page1, onPageWillLeave'); + ionViewWillLeave() { + console.log('Tab1Page1, ionViewWillLeave'); } - onPageDidLeave() { - console.log('Tab1Page1, onPageDidLeave'); + ionViewDidLeave() { + console.log('Tab1Page1, ionViewDidLeave'); } - onPageDidUnload() { - console.log('Tab1Page1, onPageDidUnload'); + ionViewDidUnload() { + console.log('Tab1Page1, ionViewDidUnload'); } } @@ -197,24 +197,24 @@ class Tab1Page2 { this.nav.push(Tab1Page3) } - onPageWillEnter() { - console.log('Tab1Page2, onPageWillEnter'); + ionViewWillEnter() { + console.log('Tab1Page2, ionViewWillEnter'); } - onPageDidEnter() { - console.log('Tab1Page2, onPageDidEnter'); + ionViewDidEnter() { + console.log('Tab1Page2, ionViewDidEnter'); } - onPageWillLeave() { - console.log('Tab1Page2, onPageWillLeave'); + ionViewWillLeave() { + console.log('Tab1Page2, ionViewWillLeave'); } - onPageDidLeave() { - console.log('Tab1Page2, onPageDidLeave'); + ionViewDidLeave() { + console.log('Tab1Page2, ionViewDidLeave'); } - onPageDidUnload() { - console.log('Tab1Page2, onPageDidUnload'); + ionViewDidUnload() { + console.log('Tab1Page2, ionViewDidUnload'); } } @@ -233,24 +233,24 @@ class Tab1Page2 { class Tab1Page3 { constructor(private nav: NavController) {} - onPageWillEnter() { - console.log('Tab1Page3, onPageWillEnter'); + ionViewWillEnter() { + console.log('Tab1Page3, ionViewWillEnter'); } - onPageDidEnter() { - console.log('Tab1Page3, onPageDidEnter'); + ionViewDidEnter() { + console.log('Tab1Page3, ionViewDidEnter'); } - onPageWillLeave() { - console.log('Tab1Page3, onPageWillLeave'); + ionViewWillLeave() { + console.log('Tab1Page3, ionViewWillLeave'); } - onPageDidLeave() { - console.log('Tab1Page3, onPageDidLeave'); + ionViewDidLeave() { + console.log('Tab1Page3, ionViewDidLeave'); } - onPageDidUnload() { - console.log('Tab1Page3, onPageDidUnload'); + ionViewDidUnload() { + console.log('Tab1Page3, ionViewDidUnload'); } } @@ -277,24 +277,24 @@ class Tab2Page1 { this.nav.push(Tab2Page2) } - onPageWillEnter() { - console.log('Tab2Page1, onPageWillEnter'); + ionViewWillEnter() { + console.log('Tab2Page1, ionViewWillEnter'); } - onPageDidEnter() { - console.log('Tab2Page1, onPageDidEnter'); + ionViewDidEnter() { + console.log('Tab2Page1, ionViewDidEnter'); } - onPageWillLeave() { - console.log('Tab2Page1, onPageWillLeave'); + ionViewWillLeave() { + console.log('Tab2Page1, ionViewWillLeave'); } - onPageDidLeave() { - console.log('Tab2Page1, onPageDidLeave'); + ionViewDidLeave() { + console.log('Tab2Page1, ionViewDidLeave'); } - onPageDidUnload() { - console.log('Tab2Page1, onPageDidUnload'); + ionViewDidUnload() { + console.log('Tab2Page1, ionViewDidUnload'); } } @@ -318,24 +318,24 @@ class Tab2Page2 { this.nav.push(Tab2Page3) } - onPageWillEnter() { - console.log('Tab2Page2, onPageWillEnter'); + ionViewWillEnter() { + console.log('Tab2Page2, ionViewWillEnter'); } - onPageDidEnter() { - console.log('Tab2Page2, onPageDidEnter'); + ionViewDidEnter() { + console.log('Tab2Page2, ionViewDidEnter'); } - onPageWillLeave() { - console.log('Tab2Page2, onPageWillLeave'); + ionViewWillLeave() { + console.log('Tab2Page2, ionViewWillLeave'); } - onPageDidLeave() { - console.log('Tab2Page2, onPageDidLeave'); + ionViewDidLeave() { + console.log('Tab2Page2, ionViewDidLeave'); } - onPageDidUnload() { - console.log('Tab2Page2, onPageDidUnload'); + ionViewDidUnload() { + console.log('Tab2Page2, ionViewDidUnload'); } } @@ -354,24 +354,24 @@ class Tab2Page2 { class Tab2Page3 { constructor(private nav: NavController) {} - onPageWillEnter() { - console.log('Tab2Page3, onPageWillEnter'); + ionViewWillEnter() { + console.log('Tab2Page3, ionViewWillEnter'); } - onPageDidEnter() { - console.log('Tab2Page3, onPageDidEnter'); + ionViewDidEnter() { + console.log('Tab2Page3, ionViewDidEnter'); } - onPageWillLeave() { - console.log('Tab2Page3, onPageWillLeave'); + ionViewWillLeave() { + console.log('Tab2Page3, ionViewWillLeave'); } - onPageDidLeave() { - console.log('Tab2Page3, onPageDidLeave'); + ionViewDidLeave() { + console.log('Tab2Page3, ionViewDidLeave'); } - onPageDidUnload() { - console.log('Tab2Page3, onPageDidUnload'); + ionViewDidUnload() { + console.log('Tab2Page3, ionViewDidUnload'); } } @@ -389,24 +389,24 @@ class Tab2Page3 { }) class Tab3Page1 { - onPageWillEnter() { - console.log('Tab3Page1, onPageWillEnter'); + ionViewWillEnter() { + console.log('Tab3Page1, ionViewWillEnter'); } - onPageDidEnter() { - console.log('Tab3Page1, onPageDidEnter'); + ionViewDidEnter() { + console.log('Tab3Page1, ionViewDidEnter'); } - onPageWillLeave() { - console.log('Tab3Page1, onPageWillLeave'); + ionViewWillLeave() { + console.log('Tab3Page1, ionViewWillLeave'); } - onPageDidLeave() { - console.log('Tab3Page1, onPageDidLeave'); + ionViewDidLeave() { + console.log('Tab3Page1, ionViewDidLeave'); } - onPageDidUnload() { - console.log('Tab3Page1, onPageDidUnload'); + ionViewDidUnload() { + console.log('Tab3Page1, ionViewDidUnload'); } }