javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(transition): iOS show back btn after insert

Browse Source 
Closes #638
This commit is contained in:
Adam Bradley
2015-11-25 11:45:07 -06:00
parent 7fd1486475
commit 4fc78d3e44
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ionic/animations/ios-transition.ts
View File

@ -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 {

5
ionic/components/nav/nav-controller.ts
View File

@ -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();
}