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

chore(animation): clearAsync on destroy, reset tmr each clear

Browse Source
This commit is contained in:
Adam Bradley
2016-02-21 21:47:52 -06:00
parent ea5172527b
commit 548b7d52d1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ionic/animations/animation.ts
View File

@ -56,8 +56,6 @@ export class Animation {
this._pFns = []; this._pFns = [];
this._fFns = []; this._fFns = [];
this._fOnceFns = []; this._fOnceFns = [];
this._clearAsync();
} }
element(ele: any): Animation { element(ele: any): Animation {
@ -381,6 +379,7 @@ export class Animation {
if (this._tmr) { if (this._tmr) {
this._unregTrans && this._unregTrans(); this._unregTrans && this._unregTrans();
clearTimeout(this._tmr); clearTimeout(this._tmr);
this._tmr = 0;
} }
} }
@ -722,6 +721,7 @@ export class Animation {
} }
} }
this._clearAsync();
this._reset(); this._reset();
} }

2
ionic/gestures/gesture.ts
View File

@ -31,7 +31,7 @@ export class Gesture {
this._options = opts; this._options = opts;
} }
options(opts = {}) { options(opts: any) {
assign(this._options, opts); assign(this._options, opts);
} }