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(view): prevent flicker

Browse Source
This commit is contained in:
Adam Bradley
2014-11-26 10:11:21 -06:00
parent 070724c522
commit 5966c675f5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
js/angular/service/clickBlock.js vendored
View File

@@ -20,6 +20,7 @@ function($document, $ionicBody, $timeout) {
cb.classList.remove(CSS_HIDE);
} else {
$ionicBody.append(cb);
isAttached = true;
}
});

5
js/angular/service/viewSwitcher.js vendored
View File

@@ -231,8 +231,7 @@ function($timeout, $document, $q, $ionicClickBlock, $ionicConfig, $ionicNavBarDe
if (viewTransition.shouldAnimate) {
// 2) attach transitionend events (and fallback timer)
enteringEle.on(TRANSITIONEND_EVENT, transitionComplete);
leavingEle && leavingEle.on(TRANSITIONEND_EVENT, transitionComplete);
enteringEle.data(DATA_FALLBACK_TIMER, $timeout(transitionComplete, 750));
enteringEle.data(DATA_FALLBACK_TIMER, $timeout(transitionComplete, 1000));
}
// 3) stage entering element, opacity 0, no transition duration
@@ -271,8 +270,8 @@ function($timeout, $document, $q, $ionicClickBlock, $ionicConfig, $ionicNavBarDe
transitionComplete.x = true;
enteringEle.off(TRANSITIONEND_EVENT, transitionComplete);
leavingEle && leavingEle.off(TRANSITIONEND_EVENT, transitionComplete);
$timeout.cancel(enteringEle.data(DATA_FALLBACK_TIMER));
leavingEle && $timeout.cancel(leavingEle.data(DATA_FALLBACK_TIMER));
// 8) emit that the views have finished transitioning
// each parent nav-view will update which views are active and cached