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

refactor(transition): update android transitions

Browse Source
This commit is contained in:
Adam Bradley
2014-12-10 17:41:25 -06:00
parent b830c89975
commit 5392dbac13
7 changed files with 72 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/angular/controller/navBarController.js vendored
View File

@@ -244,14 +244,14 @@ function($scope, $element, $attrs, $compile, $timeout, $ionicNavBarDelegate, $io
self.transition = function(enteringHeaderBar, leavingHeaderBar, viewData) {
var enteringHeaderBarCtrl = enteringHeaderBar.controller();
var transitionFn = $ionicConfig.transitions.navBar[viewData.transition];
var transitionFn = $ionicConfig.transitions.navBar[viewData.navBarTransition] || $ionicConfig.transitions.navBar.none;
var transitionId = viewData.transitionId;
enteringHeaderBarCtrl.beforeEnter(viewData);
var navBarTransition = transitionFn(enteringHeaderBar, leavingHeaderBar, viewData.direction, viewData.shouldAnimate && self.isInitialized);
ionic.DomUtil.cachedAttr($element, 'nav-bar-transition', viewData.transition);
ionic.DomUtil.cachedAttr($element, 'nav-bar-transition', viewData.navBarTransition);
ionic.DomUtil.cachedAttr($element, 'nav-bar-direction', viewData.direction);
if (navBarTransition.shouldAnimate) {

14
js/angular/controller/navViewController.js vendored
View File

@@ -16,7 +16,6 @@ function($scope, $element, $attrs, $compile, $controller, $ionicNavBarDelegate,
var DATA_NO_CACHE = '$noCache';
var VIEW_STATUS_ACTIVE = 'active';
var VIEW_STATUS_CACHED = 'cached';
var HISTORY_AFTER_ROOT = 'after-root';
var self = this;
var direction;
@@ -134,7 +133,6 @@ function($scope, $element, $attrs, $compile, $controller, $ionicNavBarDelegate,
self.transitionEnd = function() {
var viewElements = $element.children();
var x, l, viewElement;
var isHistoryRoot;
for (x = 0, l = viewElements.length; x < l; x++) {
viewElement = viewElements.eq(x);
@@ -142,7 +140,6 @@ function($scope, $element, $attrs, $compile, $controller, $ionicNavBarDelegate,
if (viewElement.data(DATA_ELE_IDENTIFIER) === activeEleId) {
// this is the active element
navViewAttr(viewElement, VIEW_STATUS_ACTIVE);
isHistoryRoot = $ionicViewSwitcher.isHistoryRoot(viewElement);
} else if (navViewAttr(viewElement) === 'leaving' || navViewAttr(viewElement) === VIEW_STATUS_ACTIVE || navViewAttr(viewElement) === VIEW_STATUS_CACHED) {
// this is a leaving element or was the former active element, or is an cached element
@@ -155,17 +152,6 @@ function($scope, $element, $attrs, $compile, $controller, $ionicNavBarDelegate,
}
}
}
if (isHistoryRoot) {
viewElements = $element.children();
for (x = 0, l = viewElements.length; x < l; x++) {
viewElement = viewElements.eq(x);
if ($ionicViewSwitcher.isHistoryRoot(viewElement) && navViewAttr(viewElement) !== VIEW_STATUS_ACTIVE) {
$ionicViewSwitcher.historyCursorAttr(viewElement, HISTORY_AFTER_ROOT);
}
}
}
};

1
js/angular/controller/viewController.js vendored
View File

@@ -55,6 +55,7 @@ function($scope, $element, $attrs, $compile, $rootScope, $ionicViewSwitcher) {
title: viewTitle,
direction: transData.direction,
transition: transData.transition,
navBarTransition: transData.navBarTransition,
transitionId: transData.transitionId,
shouldAnimate: transData.shouldAnimate,
enableBack: transData.enableBack,