javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-21 04:53:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

- typified onDidDismiss and onWillDismiss signature to clearify supplied parameters

Browse Source
This commit is contained in:
Jan Hafner
2017-05-04 21:23:19 +02:00
parent d350ddc175
commit abf6bd1f68
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/select/select.ts
View File

@ -370,7 +370,7 @@ export class Select extends BaseInput<any> implements OnDestroy {
this._fireFocus(); this._fireFocus();
overlay.onDidDismiss((value: any) => { overlay.onDidDismiss((value: any, role: string) => {
this._fireBlur(); this._fireBlur();
this._overlay = undefined; this._overlay = undefined;
}); });

2
src/navigation/overlay-proxy.ts
View File

@ -51,7 +51,7 @@ export class OverlayProxy {
/** /**
* Called when the current viewController has be successfully dismissed * Called when the current viewController has be successfully dismissed
*/ */
onDidDismiss(callback: Function) { onDidDismiss(callback: (data: any, role: string) => void) {
this._onDidDismiss = callback; this._onDidDismiss = callback;
if (this.overlay) { if (this.overlay) {
this.overlay.onDidDismiss(this._onDidDismiss); this.overlay.onDidDismiss(this._onDidDismiss);

8
src/navigation/view-controller.ts
View File

@ -35,8 +35,8 @@ export class ViewController {
private _isHidden: boolean = false; private _isHidden: boolean = false;
private _leavingOpts: NavOptions; private _leavingOpts: NavOptions;
private _nb: Navbar; private _nb: Navbar;
private _onDidDismiss: Function; private _onDidDismiss: (data: any, role: string) => void;
private _onWillDismiss: Function; private _onWillDismiss: (data: any, role: string) => void;
private _dismissData: any; private _dismissData: any;
private _dismissRole: any; private _dismissRole: any;
private _detached: boolean; private _detached: boolean;
@ -149,14 +149,14 @@ export class ViewController {
/** /**
* Called when the current viewController has be successfully dismissed * Called when the current viewController has be successfully dismissed
*/ */
onDidDismiss(callback: Function) { onDidDismiss(callback: (data: any, role: string) => void) {
this._onDidDismiss = callback; this._onDidDismiss = callback;
} }
/** /**
* Called when the current viewController will be dismissed * Called when the current viewController will be dismissed
*/ */
onWillDismiss(callback: Function) { onWillDismiss(callback: (data: any, role: string) => void) {
this._onWillDismiss = callback; this._onWillDismiss = callback;
} }