From 4fc78d3e44d948f99eb97572c0e228b8f6528df5 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 25 Nov 2015 11:45:07 -0600
Subject: [PATCH] fix(transition): iOS show back btn after insert

Closes #638
---
 ionic/animations/ios-transition.ts     | 4 +++-
 ionic/components/nav/nav-controller.ts | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ionic/animations/ios-transition.ts b/ionic/animations/ios-transition.ts
index c3c4f39fb7..e397cecad7 100644
--- a/ionic/animations/ios-transition.ts
+++ b/ionic/animations/ios-transition.ts
@@ -72,7 +72,9 @@ class IOSTransition extends Animation {
 
         if (enteringView.enableBack()) {
           // back direction, entering page has a back button
-          enteringBackButton.fadeIn();
+          enteringBackButton
+            .before.addClass(SHOW_BACK_BTN_CSS)
+            .fadeIn();
         }
 
       } else {
diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts
index dbc5260809..b98a9c8840 100644
--- a/ionic/components/nav/nav-controller.ts
+++ b/ionic/components/nav/nav-controller.ts
@@ -239,7 +239,7 @@ export class NavController extends Ion {
 
     this.setTransitioning(true, 500);
 
-    let resolve;
+    let resolve = null;
     let promise = new Promise(res => { resolve = res; });
 
     // default the direction to "back"
@@ -353,6 +353,9 @@ export class NavController extends Ion {
 
     this._incrementId(viewCtrl);
     this._views.splice(index, 0, viewCtrl);
+
+    this._cleanup();
+
     return Promise.resolve();
   }