From abf6bd1f6846b6b8228f03ba59e1c9e953ec586b Mon Sep 17 00:00:00 2001 From: Jan Hafner Date: Thu, 4 May 2017 21:23:19 +0200 Subject: [PATCH] - typified onDidDismiss and onWillDismiss signature to clearify supplied parameters --- src/components/select/select.ts | 2 +- src/navigation/overlay-proxy.ts | 2 +- src/navigation/view-controller.ts | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/select/select.ts b/src/components/select/select.ts index a7648c0f7a..469a6e056a 100644 --- a/src/components/select/select.ts +++ b/src/components/select/select.ts @@ -370,7 +370,7 @@ export class Select extends BaseInput implements OnDestroy { this._fireFocus(); - overlay.onDidDismiss((value: any) => { + overlay.onDidDismiss((value: any, role: string) => { this._fireBlur(); this._overlay = undefined; }); diff --git a/src/navigation/overlay-proxy.ts b/src/navigation/overlay-proxy.ts index 57ca1cc6df..61f7198996 100644 --- a/src/navigation/overlay-proxy.ts +++ b/src/navigation/overlay-proxy.ts @@ -51,7 +51,7 @@ export class OverlayProxy { /** * Called when the current viewController has be successfully dismissed */ - onDidDismiss(callback: Function) { + onDidDismiss(callback: (data: any, role: string) => void) { this._onDidDismiss = callback; if (this.overlay) { this.overlay.onDidDismiss(this._onDidDismiss); diff --git a/src/navigation/view-controller.ts b/src/navigation/view-controller.ts index 219ff933dd..7e1775b4e5 100644 --- a/src/navigation/view-controller.ts +++ b/src/navigation/view-controller.ts @@ -35,8 +35,8 @@ export class ViewController { private _isHidden: boolean = false; private _leavingOpts: NavOptions; private _nb: Navbar; - private _onDidDismiss: Function; - private _onWillDismiss: Function; + private _onDidDismiss: (data: any, role: string) => void; + private _onWillDismiss: (data: any, role: string) => void; private _dismissData: any; private _dismissRole: any; private _detached: boolean; @@ -149,14 +149,14 @@ export class ViewController { /** * Called when the current viewController has be successfully dismissed */ - onDidDismiss(callback: Function) { + onDidDismiss(callback: (data: any, role: string) => void) { this._onDidDismiss = callback; } /** * Called when the current viewController will be dismissed */ - onWillDismiss(callback: Function) { + onWillDismiss(callback: (data: any, role: string) => void) { this._onWillDismiss = callback; }