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

fix(router): handle when both primary and secondary are empty-path and primary has a child

Browse Source
This commit is contained in:
vsavkin
2016-07-22 18:32:26 -07:00
parent 06e4ca4bb3
commit 2b63330a36
6 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,8 +128,6 @@ function processPathsWithParamsAgainstRoute(
const childConfig = getChildConfig(route);
const {segment, slicedPath} = split(rawSegment, consumedPaths, rawSlicedPath, childConfig);
// console.log("raw", rawSegment)
// console.log(segment.toString(), childConfig)
const snapshot = new ActivatedRouteSnapshot(
consumedPaths, Object.freeze(merge(inherited.allParams, parameters)),
@ -292,7 +290,7 @@ function createChildrenForEmptyPaths(
primarySegment._pathIndexShift = consumedPaths.length;
for (let r of routes) {
if (r.path === '') {
if (r.path === '' && getOutlet(r) !== PRIMARY_OUTLET) {
const s = new UrlSegment([], {});
s._sourceSegment = segment;
s._pathIndexShift = consumedPaths.length;