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

fix(router): guards restor an incorrect url when used with skipLocationChange

Browse Source 
Closes #12825
This commit is contained in:
vsavkin
2016-11-17 11:58:12 -08:00
committed by Chuck Jazdzewski
parent 602522beb2
commit ad20d7d260
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/@angular/router/src/router.ts
View File

@ -299,6 +299,7 @@ type NavigationParams = {
export class Router {
private currentUrlTree: UrlTree;
private rawUrlTree: UrlTree;
private currentUrlTreeStoredInLocation: UrlTree;
private navigations: BehaviorSubject<NavigationParams> =
new BehaviorSubject<NavigationParams>(null);
@ -716,6 +717,7 @@ export class Router {
let navigationIsSuccessful: boolean;
const storedState = this.currentRouterState;
const storedUrl = this.currentUrlTree;
const storedUrlInLocation = this.currentUrlTreeStoredInLocation;
routerState$
.forEach(({appliedUrl, state, shouldActivate}: any) => {
@ -726,6 +728,8 @@ export class Router {
this.currentUrlTree = appliedUrl;
this.rawUrlTree = this.urlHandlingStrategy.merge(this.currentUrlTree, rawUrl);
this.currentUrlTreeStoredInLocation =
shouldPreventPushState ? this.currentUrlTreeStoredInLocation : this.rawUrlTree;
this.currentRouterState = state;
@ -774,14 +778,13 @@ export class Router {
this.currentRouterState = storedState;
this.currentUrlTree = storedUrl;
this.rawUrlTree = this.urlHandlingStrategy.merge(this.currentUrlTree, rawUrl);
this.location.replaceState(this.serializeUrl(this.rawUrlTree));
this.location.replaceState(this.serializeUrl(storedUrlInLocation));
});
});
}
private resetUrlToCurrentUrlTree(): void {
const path = this.urlSerializer.serialize(this.rawUrlTree);
this.location.replaceState(path);
this.location.replaceState(this.urlSerializer.serialize(this.currentUrlTreeStoredInLocation));
}
}