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

improve css deactivate fallback

Browse Source
This commit is contained in:
Adam Bradley
2015-09-14 21:43:55 -05:00
parent 2fe6135800
commit 41f2942fe7
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ionic/components/view/view-controller.ts
View File

@@ -279,7 +279,7 @@ export class ViewController extends Ion {
// block any clicks during the transition and provide a
// fallback to remove the clickblock if something goes wrong
ClickBlock(true, duration + 200);
this.app.setTransitioning(true);
this.app.setTransitioning(true, duration + 200);
}
// start the transition
@@ -398,7 +398,7 @@ export class ViewController extends Ion {
swipeBackProgress(progress) {
if (this.sbTransition) {
ClickBlock(true, 4000);
this.app.setTransitioning(true);
this.app.setTransitioning(true, 4000);
this.sbTransition.progress( Math.min(1, Math.max(0, progress)) );
}
}