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

chore(angular): update dependencies

Browse Source 
fixes #16539
This commit is contained in:
Manu Mtz.-Almeida
2018-12-10 21:00:01 +01:00
committed by Manu MA
parent a9247ce0e9
commit 509cfd54aa
4 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,4 @@
import { Directive, ElementRef, HostListener, Input, Optional } from '@angular/core';
import { Router } from '@angular/router';
import { NavController } from '../../providers/nav-controller';
import { IonRouterOutlet } from './ion-router-outlet';
@@ -17,7 +16,6 @@ export class IonBackButtonDelegate {
}
constructor(
@Optional() private router: Router,
@Optional() private routerOutlet: IonRouterOutlet,
private navCtrl: NavController,
private elementRef: ElementRef,
@@ -28,7 +26,7 @@ export class IonBackButtonDelegate {
if (this.routerOutlet && this.routerOutlet.canGoBack()) {
this.routerOutlet.pop();
ev.preventDefault();
} else if (this.router && this.defaultHref != null) {
} else if (this.defaultHref != null) {
this.navCtrl.navigateBack(this.defaultHref);
ev.preventDefault();
}

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

@@ -15,10 +15,10 @@ export class RouterLinkDelegate {
@Input() routerDirection: NavDirection = 'forward';
constructor(
private router: Router,
private locationStrategy: LocationStrategy,
private navCtrl: NavController,
private elementRef: ElementRef,
private router: Router,
@Optional() private routerLink?: RouterLink,
) { }