iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(router): stringify positional parameters when using routerLink

This commit is contained in:
vsavkin 2016-06-16 14:45:16 -07:00
parent cf4a9236b9
commit f8e8d22e4e
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@ function findStartingPosition(
} }
function getPath(command: any): any { function getPath(command: any): any {
if (!(typeof command === 'string')) return command; if (!(typeof command === 'string')) return command.toString();
const parts = command.toString().split(':'); const parts = command.toString().split(':');
return parts.length > 1 ? parts[1] : command; return parts.length > 1 ? parts[1] : command;
} }
@ -202,6 +202,7 @@ function createNewSegment(segment: UrlSegment, startIndex: number, commands: any
const paths = segment.pathsWithParams.slice(0, startIndex); const paths = segment.pathsWithParams.slice(0, startIndex);
let i = 0; let i = 0;
while (i < commands.length) { while (i < commands.length) {
// if we start with an object literal, we need to reuse the path part from the segment
if (i === 0 && (typeof commands[0] === 'object')) { if (i === 0 && (typeof commands[0] === 'object')) {
const p = segment.pathsWithParams[startIndex]; const p = segment.pathsWithParams[startIndex];
paths.push(new UrlPathWithParams(p.path, commands[0])); paths.push(new UrlPathWithParams(p.path, commands[0]));

9
modules/@angular/router/test/create_url_tree.spec.ts
View File

@ -20,6 +20,15 @@ describe('createUrlTree', () => {
expect(serializer.serialize(t)).toEqual("/one/11/two/22"); expect(serializer.serialize(t)).toEqual("/one/11/two/22");
}); });
it("should stringify positional parameters", () => {
const p = serializer.parse("/a/b");
const t = createRoot(p, ["/one", 11]);
const params = t.root.children[PRIMARY_OUTLET].pathsWithParams;
expect(params[0].path).toEqual("one");
expect(params[1].path).toEqual("11");
});
it("should preserve secondary segments", () => { it("should preserve secondary segments", () => {
const p = serializer.parse("/a/11/b(right:c)"); const p = serializer.parse("/a/11/b(right:c)");
const t = createRoot(p, ["/a", 11, 'd']); const t = createRoot(p, ["/a", 11, 'd']);