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

fix(angular): back-button does not push view

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-04-04 16:33:20 +02:00
parent 4db687ea17
commit bb46b5f7b9
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
angular/src/directives/navigation/ion-back-button.ts
View File

@ -1,6 +1,7 @@
import { Directive, ElementRef, HostListener, Input, Optional } from '@angular/core';
import { IonRouterOutlet } from './ion-router-outlet';
import { Router } from '@angular/router';
import { NavController } from '../..';
@Directive({
selector: 'ion-back-button'
@ -18,6 +19,7 @@ export class IonBackButton {
constructor(
@Optional() private router: Router,
@Optional() private routerOutlet: IonRouterOutlet,
private navCtrl: NavController,
private elementRef: ElementRef,
) {}
@ -27,6 +29,7 @@ export class IonBackButton {
this.routerOutlet.pop();
ev.preventDefault();
} else if (this.router && this.defaultHref != null) {
this.navCtrl.setGoback();
this.router.navigateByUrl(this.defaultHref);
ev.preventDefault();
}

11
angular/src/directives/navigation/router-controller.ts
View File

@ -37,7 +37,8 @@ export class StackController {
async setActive(enteringView: RouteView, direction: number | undefined) {
const leavingView = this.getActive();
const reused = this.insertView(enteringView);
const forcedGoBack = direction === -1;
const reused = this.insertView(enteringView, forcedGoBack);
direction = direction != null ? direction : (reused ? -1 : 1);
await this.transition(enteringView, leavingView, direction, this.canGoBack(1));
@ -50,14 +51,18 @@ export class StackController {
this.router.navigateByUrl(view.url);
}
private insertView(enteringView: RouteView): boolean {
private insertView(enteringView: RouteView, forcedGoBack: boolean): boolean {
if (this.stack) {
const index = this.views.indexOf(enteringView);
if (index >= 0) {
this.views = this.views.slice(0, index + 1);
return true;
} else {
this.views.push(enteringView);
if (forcedGoBack) {
this.views = [enteringView];
} else {
this.views.push(enteringView);
}
return false;
}
} else {