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($ionicConfig): separate transition JS

Browse Source
This commit is contained in:
Adam Bradley
2014-11-13 16:08:09 -06:00
parent e3f51ca8d0
commit 4ee22dd818
4 changed files with 140 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,6 @@ function($scope, $element, $attrs, $compile, $timeout, $ionicNavBarDelegate, $io
var headerBars = [];
var navElementHtml = {};
var isVisible = true;
var navBarConfig = $ionicConfig.navBar;
var queuedTransitionStart, queuedTransitionEnd, latestTransitionId;
$element.parent().data(DATA_NAV_BAR_CTRL, self);
@@ -146,8 +145,8 @@ function($scope, $element, $attrs, $compile, $timeout, $ionicNavBarDelegate, $io
if (!btnsEle) return;
var appendToRight = (buttonType == 'rightButtons') ||
(buttonType == SECONDARY_BUTTONS && navBarConfig.positionSecondaryButtons() != 'left') ||
(buttonType == PRIMARY_BUTTONS && navBarConfig.positionPrimaryButtons() == 'right');
(buttonType == SECONDARY_BUTTONS && $ionicConfig.navBar.positionSecondaryButtons() != 'left') ||
(buttonType == PRIMARY_BUTTONS && $ionicConfig.navBar.positionPrimaryButtons() == 'right');
if (appendToRight) {
// right side
@@ -230,7 +229,7 @@ function($scope, $element, $attrs, $compile, $timeout, $ionicNavBarDelegate, $io
self.transition = function(enteringHeaderBar, leavingHeaderBar, viewData) {
var enteringHeaderBarCtrl = enteringHeaderBar.controller();
var transitionFn = navBarConfig.transitionFn();
var transitionFn = $ionicConfig.transitions.navBar[$ionicConfig.navBar.transition()];
var transitionId = viewData.transitionId;
enteringHeaderBarCtrl.beforeEnter(viewData);