@@ -88,21 +88,9 @@ export class IOSTransition extends PageTransition {
88
88
// entering navbar, forward direction
89
89
enteringTitle . fromTo ( TRANSLATEX , OFF_RIGHT , CENTER , true ) ;
90
90
91
- if ( leavingHasNavbar ) {
92
- // entering navbar, forward direction, and there's a leaving navbar
93
- // should just fade in, no sliding
94
- enteringNavbarBg
95
- . beforeClearStyles ( [ TRANSLATEX ] )
96
- . fromTo ( OPACITY , 0.01 , 1 , true ) ;
97
-
98
- } else {
99
- // entering navbar, forward direction, and there's no leaving navbar
100
- // should just slide in, no fading in
101
- enteringNavbarBg
102
- . beforeClearStyles ( [ OPACITY ] )
103
- . fromTo ( TRANSLATEX , OFF_RIGHT , CENTER , true ) ;
104
- }
105
-
91
+ enteringNavbarBg
92
+ . beforeClearStyles ( [ OPACITY ] )
93
+ . fromTo ( TRANSLATEX , OFF_RIGHT , CENTER , true ) ;
106
94
107
95
if ( enteringView . enableBack ( ) ) {
108
96
// forward direction, entering page has a back button
@@ -170,20 +158,11 @@ export class IOSTransition extends PageTransition {
170
158
// leaving navbar, back direction
171
159
leavingTitle . fromTo ( TRANSLATEX , CENTER , '100%' ) ;
172
160
173
- if ( enteringHasNavbar ) {
174
- // leaving navbar, back direction, and there's an entering navbar
175
- // should just fade out, no sliding
176
- leavingNavbarBg
177
- . beforeClearStyles ( [ TRANSLATEX ] )
178
- . fromTo ( OPACITY , 0.99 , 0 ) ;
179
-
180
- } else {
181
- // leaving navbar, back direction, and there's no entering navbar
182
- // should just slide out, no fading out
183
- leavingNavbarBg
184
- . beforeClearStyles ( [ OPACITY ] )
185
- . fromTo ( TRANSLATEX , CENTER , '100%' ) ;
186
- }
161
+ // leaving navbar, back direction, and there's no entering navbar
162
+ // should just slide out, no fading out
163
+ leavingNavbarBg
164
+ . beforeClearStyles ( [ OPACITY ] )
165
+ . fromTo ( TRANSLATEX , CENTER , '100%' ) ;
187
166
188
167
let leavingBackBtnText = new Animation ( leavingNavbarEle . querySelector ( '.back-button-text' ) ) ;
189
168
leavingBackBtnText . fromTo ( TRANSLATEX , CENTER , ( 300 ) + 'px' ) ;
0 commit comments