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

fix(angular): back navigation and back-button play better (#15293)

Browse Source 
* fix(angular): use location instead of navigateByUrl
Closes #15290

* fix(angular): change router methods
This commit is contained in:
Mike Hartington
2018-08-22 15:28:11 -04:00
committed by Manu MA
parent c64f2eefc7
commit 9ddfb1bfee
6 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
angular/src/directives/navigation/ion-router-outlet.ts
View File

@ -1,6 +1,6 @@
import { Attribute, ChangeDetectorRef, ComponentFactoryResolver, ComponentRef, Directive, ElementRef, EventEmitter, Injector, Input, OnDestroy, OnInit, Optional, Output, ViewContainerRef } from '@angular/core';
import { ActivatedRoute, ChildrenOutletContexts, OutletContext, PRIMARY_OUTLET, Router } from '@angular/router';
import { StackController, RouteView } from './router-controller';
import { RouteView, StackController } from './router-controller';
import { NavController } from '../../providers/nav-controller';
import { bindLifecycleEvents } from '../../providers/angular-delegate';

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

@ -44,7 +44,7 @@ export class StackController {
pop(deep: number) {
const view = this.views[this.views.length - deep - 1];
this.navCtrl.goBack(view.url);
this.navCtrl.navigateBack(view.url);
}
private insertView(enteringView: RouteView, direction: number) {

12
angular/src/directives/proxies.ts
View File

@ -151,10 +151,10 @@ export class ChipButton {
}
export declare interface ChipIcon extends StencilComponents.IonChipIcon {}
@Directive({ selector: 'ion-chip-icon', inputs: ['color', 'mode', 'name', 'src'] })
@Directive({ selector: 'ion-chip-icon', inputs: ['color', 'mode', 'fill', 'name', 'src'] })
export class ChipIcon {
constructor(r: ElementRef) {
proxyInputs(this, r, ['color', 'mode', 'name', 'src']);
proxyInputs(this, r, ['color', 'mode', 'fill', 'name', 'src']);
}
}
@ -709,7 +709,7 @@ export class Text {
}
export declare interface Textarea extends StencilComponents.IonTextarea {}
@Directive({ selector: 'ion-textarea', inputs: ['color', 'mode', 'autocapitalize', 'autocomplete', 'autofocus', 'clearOnEdit', 'debounce', 'disabled', 'maxlength', 'minlength', 'name', 'placeholder', 'readonly', 'required', 'spellcheck', 'cols', 'rows', 'wrap', 'value'], outputs: ['ionChange', 'ionInput', 'ionStyle', 'ionBlur', 'ionFocus'] })
@Directive({ selector: 'ion-textarea', inputs: ['color', 'mode', 'autocapitalize', 'autofocus', 'clearOnEdit', 'debounce', 'disabled', 'maxlength', 'minlength', 'name', 'placeholder', 'readonly', 'required', 'spellcheck', 'cols', 'rows', 'wrap', 'value'], outputs: ['ionChange', 'ionInput', 'ionStyle', 'ionBlur', 'ionFocus'] })
export class Textarea {
ionChange: EventEmitter<any>;
ionInput: EventEmitter<any>;
@ -717,7 +717,7 @@ export class Textarea {
ionBlur: EventEmitter<any>;
ionFocus: EventEmitter<any>;
constructor(r: ElementRef) {
proxyInputs(this, r, ['color', 'mode', 'autocapitalize', 'autocomplete', 'autofocus', 'clearOnEdit', 'debounce', 'disabled', 'maxlength', 'minlength', 'name', 'placeholder', 'readonly', 'required', 'spellcheck', 'cols', 'rows', 'wrap', 'value']);
proxyInputs(this, r, ['color', 'mode', 'autocapitalize', 'autofocus', 'clearOnEdit', 'debounce', 'disabled', 'maxlength', 'minlength', 'name', 'placeholder', 'readonly', 'required', 'spellcheck', 'cols', 'rows', 'wrap', 'value']);
proxyOutputs(this, ['ionChange', 'ionInput', 'ionStyle', 'ionBlur', 'ionFocus']);
}
}
@ -749,9 +749,9 @@ export class Toolbar {
}
export declare interface ToolbarTitle extends StencilComponents.IonTitle {}
@Directive({ selector: 'ion-title', inputs: ['mode', 'color'] })
@Directive({ selector: 'ion-title', inputs: ['color'] })
export class ToolbarTitle {
constructor(r: ElementRef) {
proxyInputs(this, r, ['mode', 'color']);
proxyInputs(this, r, ['color']);
}
}

15
angular/src/providers/nav-controller.ts
View File

@ -1,4 +1,5 @@
import { Injectable, Optional } from '@angular/core';
import { Location } from '@angular/common';
import { NavigationExtras, Router, UrlTree } from '@angular/router';
export const enum NavIntent {
@ -16,24 +17,30 @@ export class NavController {
private stack: string[] = [];
constructor(
private location: Location,
@Optional() private router?: Router
) {}
goForward(url: string | UrlTree, animated?: boolean, extras?: NavigationExtras) {
navigateForward(url: string | UrlTree, animated?: boolean, extras?: NavigationExtras) {
this.setIntent(NavIntent.Forward, animated);
return this.router!.navigateByUrl(url, extras);
}
goBack(url: string | UrlTree, animated?: boolean, extras?: NavigationExtras) {
navigateBack(url: string | UrlTree, animated?: boolean, extras?: NavigationExtras) {
this.setIntent(NavIntent.Back, animated);
return this.router!.navigateByUrl(url, extras);
return this.router!.navigateByUrl(url, { replaceUrl: true, ...extras });
}
goRoot(url: string | UrlTree, animated?: boolean, extras?: NavigationExtras) {
navigateRoot(url: string | UrlTree, animated?: boolean, extras?: NavigationExtras) {
this.setIntent(NavIntent.Root, animated);
return this.router!.navigateByUrl(url, extras);
}
goBack(animated?: boolean) {
this.setIntent(NavIntent.Back, animated);
return this.location.back();
}
setIntent(intent: NavIntent, animated?: boolean) {
this.intent = intent;
this.animated = (animated === undefined)