cargdev/angular
1
0
Fork 0
Code Issues 10 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

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

@ -245,10 +245,10 @@ export class Router {
*/
parseUrl(url: string): UrlTree { return this.urlSerializer.parse(url); }
private scheduleNavigation(url: UrlTree, pop: boolean): Promise<boolean> {
private scheduleNavigation(url: UrlTree, preventPushState: boolean): Promise<boolean> {
const id = ++this.navigationId;
this.routerEvents.next(new NavigationStart(id, this.serializeUrl(url)));
return Promise.resolve().then((_) => this.runNavigate(url, false, id));
return Promise.resolve().then((_) => this.runNavigate(url, preventPushState, id));
}
private setUpLocationChangeListener(): void {
@ -257,7 +257,7 @@ export class Router {
});
}
private runNavigate(url: UrlTree, pop: boolean, id: number): Promise<boolean> {
private runNavigate(url: UrlTree, preventPushState: boolean, id: number): Promise<boolean> {
if (id !== this.navigationId) {
this.location.go(this.urlSerializer.serialize(this.currentUrlTree));
this.routerEvents.next(new NavigationCancel(id, this.serializeUrl(url)));
@ -295,7 +295,6 @@ export class Router {
})
.forEach((shouldActivate) => {
if (!shouldActivate || id !== this.navigationId) {
this.location.go(this.urlSerializer.serialize(this.currentUrlTree));
this.routerEvents.next(new NavigationCancel(id, this.serializeUrl(url)));
return Promise.resolve(false);
}
@ -304,8 +303,13 @@ export class Router {
this.currentUrlTree = updatedUrl;
this.currentRouterState = state;
if (!pop) {
this.location.go(this.urlSerializer.serialize(updatedUrl));
if (!preventPushState) {
let path = this.urlSerializer.serialize(updatedUrl);
if (this.location.isCurrentPathEqualTo(path)) {
this.location.replaceState(path);
} else {
this.location.go(path);
}
}
})
.then(