diff --git a/ionic/components/nav/test/basic/index.ts b/ionic/components/nav/test/basic/index.ts
index 23b6f4b84a..6115f188a3 100644
--- a/ionic/components/nav/test/basic/index.ts
+++ b/ionic/components/nav/test/basic/index.ts
@@ -4,28 +4,28 @@ import {NavParams, NavController} from 'ionic/ionic';
@Page({
- template: '' +
- ' {{title}} {{title}}
-
-
-
-
+
+
- Second View via href + Second View via href
- Third View via href, 3 as id param + Third View via href, 151 as id param
diff --git a/ionic/components/nav/test/routing/view2.html b/ionic/components/nav/test/routing/view2.html index f6e0b4c56c..3cd2b1d7e5 100644 --- a/ionic/components/nav/test/routing/view2.html +++ b/ionic/components/nav/test/routing/view2.html @@ -19,7 +19,7 @@ ViewController Id: {{viewCtrl.id}}- Third View via href, 12 as id param + Third View via href, 27 as id param
First View via href diff --git a/ionic/components/nav/test/routing/view3.html b/ionic/components/nav/test/routing/view3.html index 3d052263cb..99a0017846 100644 --- a/ionic/components/nav/test/routing/view3.html +++ b/ionic/components/nav/test/routing/view3.html @@ -17,7 +17,7 @@ ViewController Id: {{viewCtrl.id}}
- Second View via href + Second View via href
First View via href diff --git a/ionic/transitions/ios-transition.ts b/ionic/transitions/ios-transition.ts index cceb36062a..9d43058b5b 100644 --- a/ionic/transitions/ios-transition.ts +++ b/ionic/transitions/ios-transition.ts @@ -78,7 +78,7 @@ class IOSTransition extends Animation { if (backDirection) { // back direction enteringTitle.fromTo(TRANSLATEX, OFF_LEFT, CENTER); - enteringNavbarBg.fromTo(TRANSLATEX, OFF_LEFT, CENTER); + if (enteringView.enableBack()) { enteringBackButton.before.addClass(SHOW_BACK_BTN_CSS); enteringBackButton.fadeIn(); @@ -87,7 +87,6 @@ class IOSTransition extends Animation { } else { // forward direction enteringTitle.fromTo(TRANSLATEX, OFF_RIGHT, CENTER); - enteringNavbarBg.fromTo(TRANSLATEX, OFF_RIGHT, CENTER); if (enteringView.enableBack()) { enteringBackButton.before.addClass(SHOW_BACK_BTN_CSS); @@ -97,6 +96,17 @@ class IOSTransition extends Animation { enteringBackBtnText.fromTo(TRANSLATEX, '150px', '0px'); enteringNavBar.add(enteringBackBtnText); } + + if (leavingHasNavbar) { + // if there is a leaving navbar, then just fade this one in + enteringNavbarBg + .fromTo(TRANSLATEX, CENTER, CENTER) + .fadeIn(); + + } else { + enteringNavbarBg.fromTo(TRANSLATEX, OFF_RIGHT, CENTER); + } + } } @@ -146,7 +156,15 @@ class IOSTransition extends Animation { if (backDirection) { // back direction leavingTitle.fromTo(TRANSLATEX, CENTER, '100%'); - leavingNavbarBg.fromTo(TRANSLATEX, CENTER, '100%'); + if (enteringHasNavbar) { + // this is an entering navbar, just fade this out + leavingNavbarBg + .fromTo(TRANSLATEX, CENTER, CENTER) + .fadeOut(); + + } else { + leavingNavbarBg.fromTo(TRANSLATEX, CENTER, '100%'); + } let leavingBackBtnText = new Animation(leavingView.backBtnTextRef()); leavingBackBtnText.fromTo(TRANSLATEX, CENTER, (300) + 'px');