Merge branch 'master' of github.com:driftyco/ionic; branch 'onDidDism…

…iss-doc' of https://github.com/icedt89/ionic
alejandrofloresm · May 4, 2017 · 7f7c3cd · 7f7c3cd
2 parents de19dbe + abf6bd1
commit 7f7c3cd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/components/select/select.ts b/src/components/select/select.ts
@@ -370,7 +370,7 @@ export class Select extends BaseInput<any> 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
@@ -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
@@ -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;
   }