cargdev/angular
1
0
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(router): port fixes done on angular current router to the new one

Browse Source 
The bugs were fixed on current angular router in the following commits:
angular/angular@b2a7fd05cb
angular/angular@fa2ce8100b
angular/angular@595bcdd1ac

Closes #12
This commit is contained in:
Dimitrios Loukadakis
2016-06-10 18:57:03 +03:00
committed by vsavkin
parent 25560ed048
commit 9a67f38728
4 changed files with 57 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/@angular/router/src/directives/router_link.ts
View File

@ -1,4 +1,5 @@
import {Directive, HostBinding, HostListener, Input, OnChanges} from '@angular/core';
import {LocationStrategy} from '@angular/common';
import {Router} from '../router';
import {ActivatedRoute} from '../router_state';
@ -46,7 +47,7 @@ export class RouterLink implements OnChanges {
/**
* @internal
*/
constructor(private router: Router, private route: ActivatedRoute) {}
constructor(private router: Router, private route: ActivatedRoute, private locationStrategy: LocationStrategy) {}
@Input()
set routerLink(data: any[]|string) {
@ -59,14 +60,18 @@ export class RouterLink implements OnChanges {
ngOnChanges(changes: {}): any { this.updateTargetUrlAndHref(); }
@HostListener('click')
onClick(): boolean {
// If no target, or if target is _self, prevent default browser behavior
if (!(typeof this.target === 'string') || this.target == '_self') {
this.router.navigateByUrl(this.urlTree);
return false;
@HostListener("click", ["$event.button", "$event.ctrlKey", "$event.metaKey"])
onClick(button: number, ctrlKey: boolean, metaKey: boolean): boolean {
if (button !== 0 || ctrlKey || metaKey) {
return true;
}
return true;
if (typeof this.target === 'string' && this.target != '_self') {
return true;
}
this.router.navigateByUrl(this.urlTree);
return false;
}
private updateTargetUrlAndHref(): void {
@ -74,7 +79,7 @@ export class RouterLink implements OnChanges {
this.commands,
{relativeTo: this.route, queryParams: this.queryParams, fragment: this.fragment});
if (this.urlTree) {
this.href = this.router.serializeUrl(this.urlTree);
this.href = this.locationStrategy.prepareExternalUrl(this.router.serializeUrl(this.urlTree));
}
}
}