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

Merge pull request #8655 from manucorporat/fix-modal-alert

Browse Source 
fix(modal): alerts do not trigger modal lifecycle events
This commit is contained in:
Manu Mtz.-Almeida
2016-10-12 22:03:56 +02:00
committed by GitHub
parent dce4edf962 e2704a4a25
commit 58d09edf15
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/app/app-root.ts
View File

@ -15,6 +15,7 @@ export const AppRootToken = new OpaqueToken('USERROOT');
selector: 'ion-app', selector: 'ion-app',
template: template:
'<div #viewport app-viewport></div>' + '<div #viewport app-viewport></div>' +
'<div #modalPortal overlay-portal></div>' +
'<div #overlayPortal overlay-portal></div>' + '<div #overlayPortal overlay-portal></div>' +
'<div #loadingPortal class="loading-portal" overlay-portal></div>' + '<div #loadingPortal class="loading-portal" overlay-portal></div>' +
'<div #toastPortal class="toast-portal" overlay-portal></div>' + '<div #toastPortal class="toast-portal" overlay-portal></div>' +
@ -24,6 +25,8 @@ export class IonicApp extends Ion implements OnInit {
@ViewChild('viewport', {read: ViewContainerRef}) _viewport: ViewContainerRef; @ViewChild('viewport', {read: ViewContainerRef}) _viewport: ViewContainerRef;
@ViewChild('modalPortal', { read: OverlayPortal }) _modalPortal: OverlayPortal;
@ViewChild('overlayPortal', { read: OverlayPortal }) _overlayPortal: OverlayPortal; @ViewChild('overlayPortal', { read: OverlayPortal }) _overlayPortal: OverlayPortal;
@ViewChild('loadingPortal', { read: OverlayPortal }) _loadingPortal: OverlayPortal; @ViewChild('loadingPortal', { read: OverlayPortal }) _loadingPortal: OverlayPortal;
@ -96,6 +99,9 @@ export class IonicApp extends Ion implements OnInit {
if (portal === AppPortal.TOAST) { if (portal === AppPortal.TOAST) {
return this._toastPortal; return this._toastPortal;
} }
if (portal === AppPortal.MODAL) {
return this._modalPortal;
}
return this._overlayPortal; return this._overlayPortal;
} }
@ -110,6 +116,7 @@ export class IonicApp extends Ion implements OnInit {
export enum AppPortal { export enum AppPortal {
DEFAULT, DEFAULT,
MODAL,
LOADING, LOADING,
TOAST TOAST
}; };

3
src/components/modal/modal.ts
View File

@ -1,6 +1,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { App } from '../app/app'; import { App } from '../app/app';
import { AppPortal } from '../app/app-root';
import { isPresent } from '../../util/util'; import { isPresent } from '../../util/util';
import { ModalCmp } from './modal-component'; import { ModalCmp } from './modal-component';
import { ModalOptions } from './modal-options'; import { ModalOptions } from './modal-options';
@ -40,7 +41,7 @@ export class Modal extends ViewController {
* @returns {Promise} Returns a promise which is resolved when the transition has completed. * @returns {Promise} Returns a promise which is resolved when the transition has completed.
*/ */
present(navOptions: NavOptions = {}) { present(navOptions: NavOptions = {}) {
return this._app.present(this, navOptions); return this._app.present(this, navOptions, AppPortal.MODAL);
} }
/** /**