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

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

@@ -41,7 +41,8 @@ export class IonicApp {
*/
constructor() {
this.overlays = [];
this._disableTime = 0;
this._disTime = 0;
this._trnsTime = 0;
// Our component registry map
this.components = {};
@@ -63,9 +64,9 @@ export class IonicApp {
*/
focusHolder(val) {
if (arguments.length) {
this._focusHolder = val;
this._fcsHldr = val;
}
return this._focusHolder;
return this._fcsHldr;
}
/**
@@ -89,16 +90,29 @@ export class IonicApp {
* something goes wrong during a transition and the app wasn't re-enabled correctly.
*/
setEnabled(isEnabled, fallback=700) {
this._disableTime = (isEnabled ? 0 : Date.now() + fallback);
this._disTime = (isEnabled ? 0 : Date.now() + fallback);
ClickBlock(!isEnabled, fallback + 100);
}
/**
* Boolean if the app is actively enabled or not.
* @return {bool}
*/
isEnabled() {
return (this._disTime < Date.now());
}
setTransitioning(isTransitioning, fallback=700) {
this._trnsTime = (isTransitioning ? Date.now() + fallback : 0);
}
/**
* Boolean if the app is actively transitioning or not.
* @return {bool}
*/
isEnabled() {
return (this._disableTime < Date.now());
isTransitioning() {
console.debug('isTransitioning', (this._trnsTime > Date.now()), this._trnsTime, Date.now())
return (this._trnsTime > Date.now());
}
/**