From 40b5a83cb80e7e3fa27c035eba44bd007fd6aa38 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 1 Nov 2013 15:54:14 -0500
Subject: [PATCH] Other title slides in nicely

---
 dist/js/ionic-angular.js                 | 5 +++--
 js/ext/angular/src/directive/ionicNav.js | 5 +++--
 js/ext/angular/test/nav.html             | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

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 @@
     </navs>
 
     <script id="page.html" type="text/ng-template">
-      <div title="Home" ng-controller="CatsCtrl" class="nav-content" slide-animation="slide-in-slide-out" slide-title-animation="slide-left-fade">
+      <div title="Home" ng-controller="CatsCtrl" class="nav-content" slide-animation="slide-in-slide-out" slide-title-animation="slide-left-fade" slide-title-in-animation="slide-in-left-fade">
         <h1></h1>
         <a href="#" class="button button-success" ng-click="goNext()">Next</a>
         <list><list-item ng-repeat="item in items" on-select="goNext()">Test</list-item></list>