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

fix(loading): clear timeout if dismissed before timeout fires

Browse Source
This commit is contained in:
Justin Willis
2016-07-07 13:00:12 -05:00
committed by Adam Bradley
parent 6c6254c213
commit 5bbe31a69f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/loading/loading-component.ts
View File

@ -35,6 +35,7 @@ export class LoadingCmp {
private d: any; private d: any;
private id: number; private id: number;
private showSpinner: boolean; private showSpinner: boolean;
private durationTimeout: number;
constructor( constructor(
private _viewCtrl: ViewController, private _viewCtrl: ViewController,
@ -70,10 +71,13 @@ export class LoadingCmp {
} }
// If there is a duration, dismiss after that amount of time // If there is a duration, dismiss after that amount of time
this.d.duration ? setTimeout(() => this.dismiss('backdrop'), this.d.duration) : null; this.d.duration ? this.durationTimeout = setTimeout(() => this.dismiss('backdrop'), this.d.duration) : null;
} }
dismiss(role: any): Promise<any> { dismiss(role: any): Promise<any> {
if (this.durationTimeout) {
clearTimeout(this.durationTimeout);
}
return this._viewCtrl.dismiss(null, role); return this._viewCtrl.dismiss(null, role);
} }
} }