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

fix(compiler): emit correct types for literal arrays and maps.

Browse Source
This commit is contained in:
Tobias Bosch
2016-05-04 11:02:01 -07:00
parent 7150ace7c7
commit a81923b793
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/@angular/compiler/src/view_compiler/compile_view.ts
View File

@ -159,7 +159,8 @@ export class CompileView implements NameResolver {
proxyParams.push(new o.FnParam(paramName)); proxyParams.push(new o.FnParam(paramName));
proxyReturnEntries.push(o.variable(paramName)); proxyReturnEntries.push(o.variable(paramName));
} }
createPureProxy(o.fn(proxyParams, [new o.ReturnStatement(o.literalArr(proxyReturnEntries))], new o.ArrayType(o.DYNAMIC_TYPE)), createPureProxy(o.fn(proxyParams, [new o.ReturnStatement(o.literalArr(proxyReturnEntries))],
new o.ArrayType(o.DYNAMIC_TYPE)),
values.length, proxyExpr, this); values.length, proxyExpr, this);
return proxyExpr.callFn(values); return proxyExpr.callFn(values);
} }
@ -178,7 +179,8 @@ export class CompileView implements NameResolver {
proxyReturnEntries.push([entries[i][0], o.variable(paramName)]); proxyReturnEntries.push([entries[i][0], o.variable(paramName)]);
values.push(<o.Expression>entries[i][1]); values.push(<o.Expression>entries[i][1]);
} }
createPureProxy(o.fn(proxyParams, [new o.ReturnStatement(o.literalMap(proxyReturnEntries))], new o.MapType(o.DYNAMIC_TYPE)), createPureProxy(o.fn(proxyParams, [new o.ReturnStatement(o.literalMap(proxyReturnEntries))],
new o.MapType(o.DYNAMIC_TYPE)),
entries.length, proxyExpr, this); entries.length, proxyExpr, this);
return proxyExpr.callFn(values); return proxyExpr.callFn(values);
} }

2
modules/@angular/compiler_cli/integrationtest/src/basic.html
View File

@ -1,4 +1,4 @@
<div>{{ctxProp}}</div> <div [attr.array]="[0]" [attr.map]="{a:1}">{{ctxProp}}</div>
<form><input type="button" [(ngModel)]="ctxProp"/></form> <form><input type="button" [(ngModel)]="ctxProp"/></form>
<my-comp *ngIf="ctxBool"></my-comp> <my-comp *ngIf="ctxBool"></my-comp>
<div *ngFor="let x of ctxArr" [attr.value]="x"></div> <div *ngFor="let x of ctxArr" [attr.value]="x"></div>