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

2
ionic/components/app/activator.ts
View File

@@ -257,7 +257,7 @@ export class Activator {
deactivate() {
const self = this;
if (self.app.isTransitioning() && self.deactivateAttempt < 10) {
if (self.app.isTransitioning() && self.deactivateAttempt < 30) {
// the app is actively transitioning, don't bother deactivating
// anything this makes it easier on the GPU so it doesn't
// have to redraw any buttons during a transition

8
ionic/components/app/app.ts
View File

@@ -40,7 +40,7 @@ export class IonicApp {
*/
constructor() {
this.overlays = [];
this._transTime = 0;
this._transDone = 0;
// Our component registry map
this.components = {};
@@ -82,8 +82,8 @@ export class IonicApp {
* slides up, etc. After the transition completes it is set back to `false`.
* @param {bool} isTransitioning
*/
setTransitioning(isTransitioning) {
this._transTime = (isTransitioning ? Date.now() : 0);
setTransitioning(isTransitioning, msTilDone=800) {
this._transDone = (isTransitioning ? Date.now() + msTilDone : 0);
}
/**
@@ -91,7 +91,7 @@ export class IonicApp {
* @return {bool}
*/
isTransitioning() {
return (this._transTime + 800 > Date.now());
return (this._transDone > Date.now());
}
/**