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

fix(router): replace state when path is equal to current path (#8766) 

Same as 2bf21e1747 but for new router.

This also fixes an issue where when application loads it clears forward history
because Router constructor calls navigateByUrl which was causing a push state to happen.
This commit is contained in:
Dimitrios Loukadakis 2016-05-26 22:02:24 +03:00 committed by Miško Hevery
parent 84f859d7b2
commit b2a7fd05cb
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,7 +151,7 @@ export class Router {
(change) => { this._navigate(this._urlSerializer.parse(change['url']), change['pop']); }); (change) => { this._navigate(this._urlSerializer.parse(change['url']), change['pop']); });
} }
private _navigate(url: UrlTree, pop?: boolean): Promise<void> { private _navigate(url: UrlTree, preventPushState?: boolean): Promise<void> {
this._urlTree = url; this._urlTree = url;
return recognize(this._componentResolver, this._rootComponentType, url, this._routeTree) return recognize(this._componentResolver, this._rootComponentType, url, this._routeTree)
.then(currTree => { .then(currTree => {
@ -160,8 +160,13 @@ export class Router {
.then(updated => { .then(updated => {
if (updated) { if (updated) {
this._routeTree = currTree; this._routeTree = currTree;
if (isBlank(pop) || !pop) { if (isBlank(preventPushState) || !preventPushState) {
this._location.go(this._urlSerializer.serialize(this._urlTree)); let path = this._urlSerializer.serialize(this._urlTree);
if (this._location.isCurrentPathEqualTo(path)) {
this._location.replaceState(path);
} else {
this._location.go(path);
}
} }
this._changes.emit(null); this._changes.emit(null);
} }

18
modules/@angular/router/test/integration_spec.ts
View File

@ -252,6 +252,24 @@ export function main() {
advance(fixture); advance(fixture);
expect(fixture.debugElement.nativeElement).toHaveText('link'); expect(fixture.debugElement.nativeElement).toHaveText('link');
}))); })));
it('should replace state when path is equal to current path',
fakeAsync(inject([Router, TestComponentBuilder, Location], (router, tcb, location) => {
let fixture = tcb.createFakeAsync(RootCmp);
router.navigateByUrl('/team/33/simple');
advance(fixture);
router.navigateByUrl('/team/22/user/victor');
advance(fixture);
router.navigateByUrl('/team/22/user/victor');
advance(fixture);
location.back();
advance(fixture);
expect(location.path()).toEqual('/team/33/simple');
})));
} }
}); });
} }