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

fix(router): add segmentPath to the link DSL

Browse Source
This commit is contained in:
vsavkin
2016-08-04 17:19:23 -07:00
committed by Alex Rickabaugh
parent 99989f5d3f
commit 4f17dbc721
5 changed files with 52 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/@angular/router/src/create_url_tree.ts
View File

@ -101,17 +101,21 @@ function normalizeCommands(commands: any[]): NormalizedNavigationCommands {
continue;
}
if (typeof c === 'object' && c.segmentPath !== undefined) {
res.push(c.segmentPath);
continue;
}
if (!(typeof c === 'string')) {
res.push(c);
continue;
}
const parts = c.split('/');
for (let j = 0; j < parts.length; ++j) {
let cc = parts[j];
if (i === 0) {
const parts = c.split('/');
for (let j = 0; j < parts.length; ++j) {
let cc = parts[j];
// first exp is treated in a special way
if (i == 0) {
if (j == 0 && cc == '.') { // './a'
// skip it
} else if (j == 0 && cc == '') { // '/a'
@ -121,12 +125,9 @@ function normalizeCommands(commands: any[]): NormalizedNavigationCommands {
} else if (cc != '') {
res.push(cc);
}
} else {
if (cc != '') {
res.push(cc);
}
}
} else {
res.push(c);
}
}