mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-23 05:58:26 +08:00
@ -99,7 +99,7 @@ export class ToastCmp implements AfterViewInit {
|
||||
dismiss(role: any): Promise<any> {
|
||||
clearTimeout(this.dismissTimeout);
|
||||
this.dismissTimeout = undefined;
|
||||
return this._viewCtrl.dismiss(null, role);
|
||||
return this._viewCtrl.dismiss(null, role, {disableApp: false});
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -56,6 +56,7 @@ export class Toast extends ViewController {
|
||||
* @returns {Promise} Returns a promise which is resolved when the transition has completed.
|
||||
*/
|
||||
present(navOptions: NavOptions = {}) {
|
||||
navOptions.disableApp = false;
|
||||
return this._app.present(this, navOptions, AppPortal.TOAST);
|
||||
}
|
||||
|
||||
|
@ -631,7 +631,7 @@ export class NavControllerBase extends Ion implements NavController {
|
||||
// this is the top most, or only active transition, so disable the app
|
||||
// add XXms to the duration the app is disabled when the keyboard is open
|
||||
|
||||
if (duration > DISABLE_APP_MINIMUM_DURATION) {
|
||||
if (duration > DISABLE_APP_MINIMUM_DURATION && opts.disableApp !== false) {
|
||||
// if this transition has a duration and this is the root transition
|
||||
// then set that the app is actively disabled
|
||||
this._app.setEnabled(false, duration + ACTIVE_TRANSITION_OFFSET);
|
||||
|
@ -159,6 +159,7 @@ export interface NavOptions {
|
||||
id?: string;
|
||||
keyboardClose?: boolean;
|
||||
progressAnimation?: boolean;
|
||||
disableApp?: boolean;
|
||||
ev?: any;
|
||||
updateUrl?: boolean;
|
||||
isNavRoot?: boolean;
|
||||
|
Reference in New Issue
Block a user