diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js index 4bc247a16c..1abf9887fe 100644 --- a/dist/js/ionic-angular.js +++ b/dist/js/ionic-angular.js @@ -652,8 +652,8 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges clone.addClass(childScope.slideAnimation); - $animate.addClass(newTitle, childScope.slideTitleAnimation, function() { - $animate.removeClass(newTitle, childScope.slideTitleAnimation, function() { + $animate.addClass(newTitle, childScope.slideTitleInAnimation, function() { + $animate.removeClass(newTitle, childScope.slideTitleInAnimation, function() { newTitle.scope().$destroy(); newTitle.remove(); }); @@ -679,6 +679,7 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges $scope.title = $attr.title; $scope.slideAnimation = $attr.slideAnimation || ''; $scope.slideTitleAnimation = $attr.slideTitleAnimation || ''; + $scope.slideTitleInAnimation = $attr.slideTitleInAnimation || ''; if($attr.navBar === "false") { navCtrl.hideNavBar(); diff --git a/js/ext/angular/src/directive/ionicNav.js b/js/ext/angular/src/directive/ionicNav.js index 5f231c996c..6a2526b0aa 100644 --- a/js/ext/angular/src/directive/ionicNav.js +++ b/js/ext/angular/src/directive/ionicNav.js @@ -107,8 +107,8 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges clone.addClass(childScope.slideAnimation); - $animate.addClass(newTitle, childScope.slideTitleAnimation, function() { - $animate.removeClass(newTitle, childScope.slideTitleAnimation, function() { + $animate.addClass(newTitle, childScope.slideTitleInAnimation, function() { + $animate.removeClass(newTitle, childScope.slideTitleInAnimation, function() { newTitle.scope().$destroy(); newTitle.remove(); }); @@ -134,6 +134,7 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges $scope.title = $attr.title; $scope.slideAnimation = $attr.slideAnimation || ''; $scope.slideTitleAnimation = $attr.slideTitleAnimation || ''; + $scope.slideTitleInAnimation = $attr.slideTitleInAnimation || ''; if($attr.navBar === "false") { navCtrl.hideNavBar(); diff --git a/js/ext/angular/test/nav.html b/js/ext/angular/test/nav.html index 46b8d6679c..8e14cc408e 100644 --- a/js/ext/angular/test/nav.html +++ b/js/ext/angular/test/nav.html @@ -39,7 +39,7 @@