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

fix(router): absolute redirects should work with lazy loading

Browse Source
This commit is contained in:
vsavkin
2016-08-04 18:56:22 -07:00
committed by Alex Rickabaugh
parent 4f17dbc721
commit 3a307c2794
5 changed files with 218 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,9 +18,7 @@ import {UrlSegment, UrlSegmentGroup, UrlTree, mapChildrenIntoArray} from './url_
import {last, merge} from './utils/collection';
import {TreeNode} from './utils/tree';
class NoMatch {
constructor(public segmentGroup: UrlSegmentGroup = null) {}
}
class NoMatch {}
class InheritedFromParent {
constructor(
@ -65,14 +63,8 @@ class Recognizer {
return of (new RouterStateSnapshot(this.url, rootNode));
} catch (e) {
if (e instanceof NoMatch) {
return new Observable<RouterStateSnapshot>(
(obs: Observer<RouterStateSnapshot>) =>
obs.error(new Error(`Cannot match any routes: '${e.segmentGroup}'`)));
} else {
return new Observable<RouterStateSnapshot>(
(obs: Observer<RouterStateSnapshot>) => obs.error(e));
}
return new Observable<RouterStateSnapshot>(
(obs: Observer<RouterStateSnapshot>) => obs.error(e));
}
}
@ -108,7 +100,7 @@ class Recognizer {
if (!(e instanceof NoMatch)) throw e;
}
}
throw new NoMatch(segmentGroup);
throw new NoMatch();
}
processSegmentAgainstRoute(