fix(HtmlParser): Do not add parent element for template children

fixes angular#5638
vicb · Dec 8, 2015 · 4811dc6 · 4811dc6
1 parent 9850e68
commit 4811dc6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/modules/angular2/src/compiler/html_tags.ts b/modules/angular2/src/compiler/html_tags.ts
@@ -304,8 +304,16 @@ export class HtmlTagDefinition {
   }
 
   requireExtraParent(currentParent: string): boolean {
-    return isPresent(this.requiredParents) &&
-           (isBlank(currentParent) || this.requiredParents[currentParent.toLowerCase()] != true);
+    if (isBlank(this.requiredParents)) {
+      return false;
+    }
+
+    if (isBlank(currentParent)) {
+      return true;
+    }
+
+    let lcParent = currentParent.toLowerCase();
+    return this.requiredParents[lcParent] != true && lcParent != 'template';
   }
 
   isClosedByChild(name: string): boolean {

diff --git a/modules/angular2/test/compiler/html_parser_spec.ts b/modules/angular2/test/compiler/html_parser_spec.ts
@@ -141,6 +141,14 @@ export function main() {
               ]);
         });
 
+        it('should not add the requiredParent when the parent is a template', () => {
+          expect(humanizeDom(parser.parse('<template><tr></tr></template>', 'TestComp')))
+              .toEqual([
+                [HtmlElementAst, 'template', 0],
+                [HtmlElementAst, 'tr', 1],
+              ]);
+        });
+
         it('should support explicit mamespace', () => {
           expect(humanizeDom(parser.parse('<myns:div></myns:div>', 'TestComp')))
               .toEqual([[HtmlElementAst, '@myns:div', 0]]);