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

fix(router): lazy loading keeps refetching modules (#10707)

Browse Source
This commit is contained in:
Victor Savkin
2016-08-11 22:59:53 -07:00
committed by vikerman
parent f48142e679
commit cc6749c158
3 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -406,7 +406,6 @@ export class Router {
})
.forEach((shouldActivate: boolean) => {
if (!shouldActivate || id !== this.navigationId) {
this.routerEvents.next(new NavigationCancel(id, this.serializeUrl(url)));
navigationIsSuccessful = false;
return;
}
@ -429,9 +428,14 @@ export class Router {
.then(
() => {
this.navigated = true;
this.routerEvents.next(
new NavigationEnd(id, this.serializeUrl(url), this.serializeUrl(appliedUrl)));
resolvePromise(navigationIsSuccessful);
if (navigationIsSuccessful) {
this.routerEvents.next(
new NavigationEnd(id, this.serializeUrl(url), this.serializeUrl(appliedUrl)));
resolvePromise(true);
} else {
this.routerEvents.next(new NavigationCancel(id, this.serializeUrl(url)));
resolvePromise(false);
}
},
e => {
this.currentRouterState = storedState;