diff --git a/demos/modal/index.ts b/demos/modal/index.ts index 745166d5c4..53db423b8c 100644 --- a/demos/modal/index.ts +++ b/demos/modal/index.ts @@ -49,26 +49,26 @@ export class ContactModal { console.log('ContactModal constructor') this.rootView = ModalFirstPage; } - viewLoaded() { - console.log('ContactModal viewLoaded'); + onViewLoaded() { + console.log('ContactModal onViewLoaded'); } - viewWillEnter() { - console.log('ContactModal viewWillEnter'); + onViewWillEnter() { + console.log('ContactModal onViewWillEnter'); } viewDidEnter() { console.log('ContactModal viewDidEnter'); } - viewWillLeave() { - console.log('ContactModal viewWillLeave'); + onViewWillLeave() { + console.log('ContactModal onViewWillLeave'); } - viewDidLeave() { - console.log('ContactModal viewDidLeave'); + onViewDidLeave() { + console.log('ContactModal onViewDidLeave'); } - viewWillUnload() { - console.log('ContactModal viewWillUnload'); + onViewWillUnload() { + console.log('ContactModal onViewWillUnload'); } - viewDidUnload() { - console.log('ContactModal viewDidUnload'); + onViewDidUnload() { + console.log('ContactModal onViewDidUnload'); } } diff --git a/ionic/components/modal/test/basic/index.ts b/ionic/components/modal/test/basic/index.ts index 745166d5c4..53db423b8c 100644 --- a/ionic/components/modal/test/basic/index.ts +++ b/ionic/components/modal/test/basic/index.ts @@ -49,26 +49,26 @@ export class ContactModal { console.log('ContactModal constructor') this.rootView = ModalFirstPage; } - viewLoaded() { - console.log('ContactModal viewLoaded'); + onViewLoaded() { + console.log('ContactModal onViewLoaded'); } - viewWillEnter() { - console.log('ContactModal viewWillEnter'); + onViewWillEnter() { + console.log('ContactModal onViewWillEnter'); } viewDidEnter() { console.log('ContactModal viewDidEnter'); } - viewWillLeave() { - console.log('ContactModal viewWillLeave'); + onViewWillLeave() { + console.log('ContactModal onViewWillLeave'); } - viewDidLeave() { - console.log('ContactModal viewDidLeave'); + onViewDidLeave() { + console.log('ContactModal onViewDidLeave'); } - viewWillUnload() { - console.log('ContactModal viewWillUnload'); + onViewWillUnload() { + console.log('ContactModal onViewWillUnload'); } - viewDidUnload() { - console.log('ContactModal viewDidUnload'); + onViewDidUnload() { + console.log('ContactModal onViewDidUnload'); } } diff --git a/ionic/components/overlay/overlay.ts b/ionic/components/overlay/overlay.ts index 7c359de0be..cb7fc3611c 100644 --- a/ionic/components/overlay/overlay.ts +++ b/ionic/components/overlay/overlay.ts @@ -84,7 +84,7 @@ export class OverlayRef { } this._instance = overlayInstance; - overlayInstance.viewLoaded && overlayInstance.viewLoaded(); + overlayInstance.onViewLoaded && overlayInstance.onViewLoaded(); this.zIndex = ROOT_Z_INDEX; for (let i = 0; i < app.overlays.length; i++) { @@ -119,7 +119,7 @@ export class OverlayRef { _open(opts={}) { return new Promise(resolve => { let instance = this._instance || {}; - instance.viewWillEnter && instance.viewWillEnter(); + instance.onViewWillEnter && instance.onViewWillEnter(); let animationName = (opts && opts.animation) || this._opts.enterAnimation; let animation = Animation.create(this._elementRef.nativeElement, animationName); @@ -151,8 +151,8 @@ export class OverlayRef { close(opts={}) { return new Promise(resolve => { let instance = this._instance || {}; - instance.viewWillLeave && instance.viewWillLeave(); - instance.viewWillUnload && instance.viewWillUnload(); + instance.onViewWillLeave && instance.onViewWillLeave(); + instance.onViewWillUnload && instance.onViewWillUnload(); let animationName = (opts && opts.animation) || this._opts.leaveAnimation; let animation = Animation.create(this._elementRef.nativeElement, animationName); @@ -161,8 +161,8 @@ export class OverlayRef { this.app.setEnabled(false, animation.duration()); animation.play().then(() => { - instance.viewDidLeave && instance.viewDidLeave(); - instance.viewDidUnload && instance.viewDidUnload(); + instance.onViewDidLeave && instance.onViewDidLeave(); + instance.onViewDidUnload && instance.onViewDidUnload(); this._dispose(); diff --git a/ionic/components/view/view-item.ts b/ionic/components/view/view-item.ts index 848d6f6f80..971ffe214d 100644 --- a/ionic/components/view/view-item.ts +++ b/ionic/components/view/view-item.ts @@ -344,14 +344,14 @@ export class ViewItem { * recommended method to use when a view becomes active. */ loaded() { - this.instance && this.instance.viewLoaded && this.instance.viewLoaded(); + this.instance && this.instance.onViewLoaded && this.instance.onViewLoaded(); } /** * The view is about to enter and become the active view. */ willEnter() { - this.instance && this.instance.viewWillEnter && this.instance.viewWillEnter(); + this.instance && this.instance.onViewWillEnter && this.instance.onViewWillEnter(); } /** @@ -370,7 +370,7 @@ export class ViewItem { * The view has is about to leave and no longer be the active view. */ willLeave() { - this.instance && this.instance.viewWillLeave && this.instance.viewWillLeave(); + this.instance && this.instance.onViewWillLeave && this.instance.onViewWillLeave(); } /** @@ -378,21 +378,21 @@ export class ViewItem { * will fire, whether it is cached or unloaded. */ didLeave() { - this.instance && this.instance.viewDidLeave && this.instance.viewDidLeave(); + this.instance && this.instance.onViewDidLeave && this.instance.onViewDidLeave(); } /** * The view is about to be destroyed and have its elements removed. */ willUnload() { - this.instance && this.instance.viewWillUnload && this.instance.viewWillUnload(); + this.instance && this.instance.onViewWillUnload && this.instance.onViewWillUnload(); } /** * The view has been destroyed and its elements have been removed. */ didUnload() { - this.instance && this.instance.viewDidUnload && this.instance.viewDidUnload(); + this.instance && this.instance.onViewDidUnload && this.instance.onViewDidUnload(); } }