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

fix(common): then and else template might be set to null (#22298)

Browse Source 
PR Close #22298
This commit is contained in:
Victor Berchet
2018-02-18 18:41:43 -08:00
parent a8b5465e24
commit 8115edc82f
3 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/common/src/directives/ng_if.ts
View File

@ -117,7 +117,7 @@ export class NgIf {
}
@Input()
set ngIfThen(templateRef: TemplateRef<NgIfContext>) {
set ngIfThen(templateRef: TemplateRef<NgIfContext>|null) {
assertTemplate('ngIfThen', templateRef);
this._thenTemplateRef = templateRef;
this._thenViewRef = null; // clear previous view if any.
@ -125,7 +125,7 @@ export class NgIf {
}
@Input()
set ngIfElse(templateRef: TemplateRef<NgIfContext>) {
set ngIfElse(templateRef: TemplateRef<NgIfContext>|null) {
assertTemplate('ngIfElse', templateRef);
this._elseTemplateRef = templateRef;
this._elseViewRef = null; // clear previous view if any.
@ -166,9 +166,9 @@ export class NgIfContext {
public ngIf: any = null;
}
function assertTemplate(property: string, templateRef: TemplateRef<any>): void {
const isTemplateRef = templateRef.createEmbeddedView != null;
if (!isTemplateRef) {
function assertTemplate(property: string, templateRef: TemplateRef<any>| null): void {
const isTemplateRefOrNull = !!(!templateRef || templateRef.createEmbeddedView);
if (!isTemplateRefOrNull) {
throw new Error(`${property} must be a TemplateRef, but received '${stringify(templateRef)}'.`);
}
}