javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(activator): ensure links active during transition

Browse Source
This commit is contained in:
Adam Bradley
2015-09-23 20:32:46 -05:00
parent 3f7b3aadef
commit 1a48cbec96
7 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ionic/components/overlay/overlay.ts
View File

@@ -127,6 +127,7 @@ export class OverlayRef {
animation.before.addClass('show-overlay');
this.app.setEnabled(false, animation.duration());
this.app.setTransitioning(true, animation.duration());
this.app.zoneRunOutside(() => {
@@ -134,6 +135,7 @@ export class OverlayRef {
this.app.zoneRun(() => {
this.app.setEnabled(true);
this.app.setTransitioning(false);
animation.dispose();
instance.onViewDidEnter && instance.onViewDidEnter();
resolve();
@@ -159,6 +161,7 @@ export class OverlayRef {
animation.after.removeClass('show-overlay');
this.app.setEnabled(false, animation.duration());
this.app.setTransitioning(true, animation.duration());
animation.play().then(() => {
instance.onViewDidLeave && instance.onViewDidLeave();
@@ -167,6 +170,7 @@ export class OverlayRef {
this._dispose();
this.app.setEnabled(true);
this.app.setTransitioning(false);
animation.dispose();
resolve();