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

Revert "fix(router): change processing url tree children condition (#26243)" (#27516)

Browse Source 
This reverts commit ccc77ca441.

Breaks Pantheon see cl/224256517.

PR Close #27516
This commit is contained in:
Igor Minar
2018-12-06 08:27:25 -08:00
parent 4f61832d1c
commit 091a504377
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/router/src/create_url_tree.ts
View File

@ -147,17 +147,14 @@ function findStartingPosition(nav: Navigation, tree: UrlTree, route: ActivatedRo
return new Position(tree.root, true, 0);
}
const segmentGroup = route.snapshot._urlSegment;
if (route.snapshot._lastPathIndex === -1) {
// Pathless ActivatedRoute has _lastPathIndex === -1 but should not process children
// see issue #26224
return new Position(segmentGroup, segmentGroup.segments.length === 0, 0);
return new Position(route.snapshot._urlSegment, true, 0);
}
const modifier = isMatrixParams(nav.commands[0]) ? 0 : 1;
const index = route.snapshot._lastPathIndex + modifier;
return createPositionApplyingDoubleDots(segmentGroup, index, nav.numberOfDoubleDots);
return createPositionApplyingDoubleDots(
route.snapshot._urlSegment, index, nav.numberOfDoubleDots);
}
function createPositionApplyingDoubleDots(