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

fix(router): terminal route in custom matcher

Browse Source
This commit is contained in:
Sam Verschueren
2017-03-01 21:37:28 +01:00
committed by Alex Rickabaugh
parent 3b588fe2b0
commit b399cb26d9
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/router/src/recognize.ts
View File

@ -181,7 +181,9 @@ function match(segmentGroup: UrlSegmentGroup, route: Route, segments: UrlSegment
const posParams: {[n: string]: string} = {};
forEach(res.posParams !, (v: UrlSegment, k: string) => { posParams[k] = v.path; });
const parameters = {...posParams, ...res.consumed[res.consumed.length - 1].parameters};
const parameters = res.consumed.length > 0 ?
{...posParams, ...res.consumed[res.consumed.length - 1].parameters} :
posParams;
return {consumedSegments: res.consumed, lastChild: res.consumed.length, parameters};
}