diff --git a/demos/modal/index.ts b/demos/modal/index.ts index 53db423b8c..8cbcb09df5 100644 --- a/demos/modal/index.ts +++ b/demos/modal/index.ts @@ -55,8 +55,8 @@ export class ContactModal { onViewWillEnter() { console.log('ContactModal onViewWillEnter'); } - viewDidEnter() { - console.log('ContactModal viewDidEnter'); + onViewDidEnter() { + console.log('ContactModal onViewDidEnter'); } onViewWillLeave() { console.log('ContactModal onViewWillLeave'); diff --git a/ionic/components/modal/test/basic/index.ts b/ionic/components/modal/test/basic/index.ts index 53db423b8c..8cbcb09df5 100644 --- a/ionic/components/modal/test/basic/index.ts +++ b/ionic/components/modal/test/basic/index.ts @@ -55,8 +55,8 @@ export class ContactModal { onViewWillEnter() { console.log('ContactModal onViewWillEnter'); } - viewDidEnter() { - console.log('ContactModal viewDidEnter'); + onViewDidEnter() { + console.log('ContactModal onViewDidEnter'); } onViewWillLeave() { console.log('ContactModal onViewWillLeave'); diff --git a/ionic/components/nav/test/routing/index.ts b/ionic/components/nav/test/routing/index.ts index 228e942b4d..7be3fb86d3 100644 --- a/ionic/components/nav/test/routing/index.ts +++ b/ionic/components/nav/test/routing/index.ts @@ -10,7 +10,7 @@ class View1Cmp { this.viewItem = viewItem; console.log(`View1Cmp, path: ${this.path}`); } - viewDidEnter() { + onViewDidEnter() { this.windowHash = window.location.hash; } } @@ -23,7 +23,7 @@ class View2Cmp { this.viewItem = viewItem; console.log(`View2Cmp, path: ${this.path}`); } - viewDidEnter() { + onViewDidEnter() { this.windowHash = window.location.hash; } } @@ -37,7 +37,7 @@ class View3Cmp { this.viewItem = viewItem; console.log(`View3Cmp, path: ${this.path}, param id: ${this.id}`); } - viewDidEnter() { + onViewDidEnter() { this.windowHash = window.location.hash; } } diff --git a/ionic/components/overlay/overlay.ts b/ionic/components/overlay/overlay.ts index cb7fc3611c..0053ff7d47 100644 --- a/ionic/components/overlay/overlay.ts +++ b/ionic/components/overlay/overlay.ts @@ -135,7 +135,7 @@ export class OverlayRef { this.app.zoneRun(() => { this.app.setEnabled(true); animation.dispose(); - instance.viewDidEnter && instance.viewDidEnter(); + instance.onViewDidEnter && instance.onViewDidEnter(); resolve(); }); diff --git a/ionic/components/view/view-item.ts b/ionic/components/view/view-item.ts index 971ffe214d..0ef0eea026 100644 --- a/ionic/components/view/view-item.ts +++ b/ionic/components/view/view-item.ts @@ -363,7 +363,7 @@ export class ViewItem { if (navbarView) { navbarView.didEnter(); } - this.instance && this.instance.viewDidEnter && this.instance.viewDidEnter(); + this.instance && this.instance.onViewDidEnter && this.instance.onViewDidEnter(); } /**