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

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

Browse Source 
This reverts commit ad20d7d260.
This commit is contained in:
Chuck Jazdzewski
2016-11-22 12:15:54 -08:00
parent 909268036b
commit 3e548de99d
2 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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