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

fix(core): don’t create a comment for components with empty template. (#15260)

Browse Source 
Fixes #15143

PR Close #15260
This commit is contained in:
Tobias Bosch
2017-03-17 15:34:37 -07:00
committed by Miško Hevery
parent aeb99645bb
commit f8c075ae27
3 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/compiler/src/view_compiler/view_compiler.ts
View File

@ -166,10 +166,8 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver {
});
}
templateVisitAll(this, astNodes);
if (astNodes.length === 0 ||
(this.parent && needsAdditionalRootNode(astNodes[astNodes.length - 1]))) {
// if the view is empty, or an embedded view has a view container as last root nde,
// create an additional root node.
if (this.parent && (astNodes.length === 0 || needsAdditionalRootNode(astNodes))) {
// if the view is an embedded view, then we need to add an additional root node in some cases
this.nodes.push(() => ({
sourceSpan: null,
nodeDef: o.importExpr(createIdentifier(Identifiers.anchorDef)).callFn([
@ -971,19 +969,20 @@ function depDef(dep: CompileDiDependencyMetadata): o.Expression {
return flags === DepFlags.None ? expr : o.literalArr([o.literal(flags), expr]);
}
function needsAdditionalRootNode(ast: TemplateAst): boolean {
if (ast instanceof EmbeddedTemplateAst) {
return ast.hasViewContainer;
function needsAdditionalRootNode(astNodes: TemplateAst[]): boolean {
const lastAstNode = astNodes[astNodes.length - 1];
if (lastAstNode instanceof EmbeddedTemplateAst) {
return lastAstNode.hasViewContainer;
}
if (ast instanceof ElementAst) {
if (ast.name === NG_CONTAINER_TAG && ast.children.length) {
return needsAdditionalRootNode(ast.children[ast.children.length - 1]);
if (lastAstNode instanceof ElementAst) {
if (lastAstNode.name === NG_CONTAINER_TAG && lastAstNode.children.length) {
return needsAdditionalRootNode(lastAstNode.children);
}
return ast.hasViewContainer;
return lastAstNode.hasViewContainer;
}
return ast instanceof NgContentAst;
return lastAstNode instanceof NgContentAst;
}
function lifecycleHookToNodeFlag(lifecycleHook: LifecycleHooks): NodeFlags {