mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-10 00:27:41 +08:00
Fixed initial animation issue
This commit is contained in:
14
js/ext/angular/src/directive/ionicNavRouter.js
vendored
14
js/ext/angular/src/directive/ionicNavRouter.js
vendored
@ -31,16 +31,24 @@ angular.module('ionic.ui.navRouter', [])
|
||||
link: function($scope, $element, $attr) {
|
||||
$scope.animation = $attr.animation;
|
||||
|
||||
$element.addClass('noop-animation');
|
||||
|
||||
var isFirst = true;
|
||||
|
||||
var initTransition = function() {
|
||||
//$element.addClass($scope.animation);
|
||||
};
|
||||
|
||||
var reverseTransition = function() {
|
||||
console.log('REVERSE');
|
||||
$element.removeClass('noop-animation');
|
||||
$element.removeClass($scope.animation);
|
||||
$element.addClass($scope.animation + '-reverse');
|
||||
};
|
||||
|
||||
var forwardTransition = function() {
|
||||
console.log('FORWARD');
|
||||
$element.removeClass('noop-animation');
|
||||
$element.removeClass($scope.animation + '-reverse');
|
||||
$element.addClass($scope.animation);
|
||||
};
|
||||
@ -56,7 +64,7 @@ angular.module('ionic.ui.navRouter', [])
|
||||
|
||||
if(isFirst) {
|
||||
// Don't animate
|
||||
//return;
|
||||
return;
|
||||
}
|
||||
|
||||
if(back) {
|
||||
@ -72,9 +80,7 @@ angular.module('ionic.ui.navRouter', [])
|
||||
$rootScope.actualLocation = $location.path();
|
||||
if(isFirst) {
|
||||
isFirst = false;
|
||||
$timeout(function() {
|
||||
//reverseTransition();
|
||||
}, 200);
|
||||
initTransition();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user