javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(tabs): popToRoot catches the rejected promise

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2017-02-24 17:32:53 +01:00
parent 8d9f374065
commit 738515879b
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/tabs/tabs.ts
View File

@@ -529,12 +529,16 @@ export class Tabs extends Ion implements AfterViewInit {
} else if (tab.length() > 1) {
// if we're a few pages deep, pop to root
tab.popToRoot();
tab.popToRoot().catch(() => {
console.debug('Tabs: pop to root was cancelled');
});
} else if (getComponent(this._linker, tab.root) !== active.component) {
// Otherwise, if the page we're on is not our real root, reset it to our
// default root type
tab.setRoot(tab.root);
tab.setRoot(tab.root).catch(() => {
console.debug('Tabs: reset root was cancelled');
});
}
}
}
@@ -545,7 +549,7 @@ export class Tabs extends Ion implements AfterViewInit {
*/
setTabbarPosition(top: number, bottom: number) {
if (this._top !== top || this._bottom !== bottom) {
const tabbarEle = <HTMLElement>this._tabbar.nativeElement;
var tabbarEle = <HTMLElement>this._tabbar.nativeElement;
tabbarEle.style.top = (top > -1 ? top + 'px' : '');
tabbarEle.style.bottom = (bottom > -1 ? bottom + 'px' : '');
tabbarEle.classList.add('show-tabbar');

5
src/components/tabs/test/advanced/app.module.ts
View File

@@ -315,6 +315,11 @@ export class Tab2Page3 {
constructor(public navCtrl: NavController) {}
ionViewCanLeave() {
console.log('Tab2Page3, ionViewCanLeave', false);
return false;
}
ionViewWillEnter() {
console.log('Tab2Page3, ionViewWillEnter');
}

3
src/components/tabs/test/advanced/tab2page3.html
View File

@@ -4,8 +4,9 @@
<h2>Tab 2, Page 3</h2>
<p>No Header.</p>
<p>This page can't be left</p>
<p><button ion-button (click)="navCtrl.pop()">Back to Tab 2, Page 2</button></p>
<p><button ion-button navPop>Back to Tab 2, Page 2</button></p>
<div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>
<div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div><div f></div>