honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(router): fix replaceUrl on RouterLink directives

This commit is contained in:
Victor Berchet 2016-12-02 15:32:39 -08:00 committed by Alex Rickabaugh
parent f562cbf86c
commit 349ad75de3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,10 @@ export class RouterLink {
@HostListener('click', [])
onClick(): boolean {
const extras = {skipLocationChange: attrBoolValue(this.skipLocationChange)};
const extras = {
skipLocationChange: attrBoolValue(this.skipLocationChange),
replaceUrl: attrBoolValue(this.replaceUrl),
};
this.router.navigateByUrl(this.urlTree, extras);
return true;
}
@ -114,7 +117,6 @@ export class RouterLink {
fragment: this.fragment,
preserveQueryParams: attrBoolValue(this.preserveQueryParams),
preserveFragment: attrBoolValue(this.preserveFragment),
replaceUrl: attrBoolValue(this.replaceUrl),
});
}
}
@ -176,7 +178,10 @@ export class RouterLinkWithHref implements OnChanges, OnDestroy {
return true;
}
const extras = {skipLocationChange: attrBoolValue(this.skipLocationChange)};
const extras = {
skipLocationChange: attrBoolValue(this.skipLocationChange),
replaceUrl: attrBoolValue(this.replaceUrl),
};
this.router.navigateByUrl(this.urlTree, extras);
return false;
}
@ -192,7 +197,6 @@ export class RouterLinkWithHref implements OnChanges, OnDestroy {
fragment: this.fragment,
preserveQueryParams: attrBoolValue(this.preserveQueryParams),
preserveFragment: attrBoolValue(this.preserveFragment),
replaceUrl: attrBoolValue(this.replaceUrl),
});
}
}

6
tools/public_api_guard/router/index.d.ts vendored
View File

@ -249,7 +249,7 @@ export declare class RouterLink {
routerLink: any[] | string;
skipLocationChange: boolean;
urlTree: UrlTree;
constructor(router: Router, route: ActivatedRoute, locationStrategy: LocationStrategy);
constructor(router: Router, route: ActivatedRoute);
onClick(): boolean;
}
@ -279,10 +279,6 @@ export declare class RouterLinkWithHref implements OnChanges, OnDestroy {
};
replaceUrl: boolean;
routerLink: any[] | string;
routerLinkOptions: {
preserveQueryParams: boolean;
preserveFragment: boolean;
};
skipLocationChange: boolean;
target: string;
urlTree: UrlTree;