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): cancel remove .activated timeout

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2016-11-18 21:25:04 +01:00
parent bb800339f8
commit 9510a2bb3b
6 changed files with 290 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/util/dom.ts
View File

@@ -48,7 +48,10 @@ export function rafFrames(framesToWait: number, callback: Function) {
let rafId: any;
let timeoutId: any;
if (framesToWait < 2) {
if (framesToWait === 0) {
callback();
}else if (framesToWait < 2) {
rafId = nativeRaf(callback);
} else {
@@ -67,7 +70,10 @@ export function rafFrames(framesToWait: number, callback: Function) {
export function zoneRafFrames(framesToWait: number, callback: Function) {
framesToWait = Math.ceil(framesToWait);
if (framesToWait < 2) {
if (framesToWait === 0) {
callback();
} else if (framesToWait < 2) {
raf(callback);
} else {