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

fix(router): throw when generating non-terminal link

Browse Source 
Closes #3979

Closes #4092
This commit is contained in:
Brian Ford
2015-09-09 07:49:02 -07:00
parent f91c087c46
commit 8aec215ca0
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/angular2/src/router/route_registry.ts
View File

@ -200,6 +200,7 @@ export class RouteRegistry {
generate(linkParams: any[], parentComponent: any): Instruction {
let segments = [];
let componentCursor = parentComponent;
var lastInstructionIsTerminal = false;
for (let i = 0; i < linkParams.length; i += 1) {
let segment = linkParams[i];
@ -233,9 +234,26 @@ export class RouteRegistry {
}
segments.push(response);
componentCursor = response.componentType;
lastInstructionIsTerminal = response.terminal;
}
var instruction: Instruction = this._generateRedirects(componentCursor);
var instruction: Instruction = null;
if (!lastInstructionIsTerminal) {
instruction = this._generateRedirects(componentCursor);
if (isPresent(instruction)) {
let lastInstruction = instruction;
while (isPresent(lastInstruction.child)) {
lastInstruction = lastInstruction.child;
}
lastInstructionIsTerminal = lastInstruction.component.terminal;
}
if (!lastInstructionIsTerminal) {
throw new BaseException(
`Link "${ListWrapper.toJSON(linkParams)}" does not resolve to a terminal instruction.`);
}
}
while (segments.length > 0) {