From 4366bd57e43c5205fde03079b7b2c961f07fc882 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 11 Nov 2014 17:20:51 -0600
Subject: [PATCH] fix(nav): prevent nav-bar flicker w/ no animation

---
 js/angular/controller/navBarController.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/js/angular/controller/navBarController.js b/js/angular/controller/navBarController.js
index d51539d0d5..f5f21bc390 100644
--- a/js/angular/controller/navBarController.js
+++ b/js/angular/controller/navBarController.js
@@ -238,7 +238,12 @@ function($scope, $element, $attrs, $compile, $timeout, $ionicNavBarDelegate, $io
     ionic.DomUtil.cachedAttr($element, 'nav-bar-transition', $ionicConfig.navBar.transition());
     ionic.DomUtil.cachedAttr($element, 'nav-bar-direction', viewData.direction);
 
-    navBarAttr(enteringHeaderBar, navBarTransition.shouldAnimate ? 'stage' : 'entering');
+    if(navBarTransition.shouldAnimate) {
+      navBarAttr(enteringHeaderBar, 'stage');
+    } else {
+      navBarAttr(enteringHeaderBar, 'entering');
+      navBarAttr(leavingHeaderBar, 'leaving');
+    }
 
     enteringHeaderBarCtrl.resetBackButton();