fix(HtmlParser): mark <source> elements as void

Fixes angular#5663
pkozlowski-opensource · Dec 7, 2015 · 5ec317a · 5ec317a
1 parent 0a44fc6
commit 5ec317a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/modules/angular2/src/compiler/html_tags.ts b/modules/angular2/src/compiler/html_tags.ts
@@ -310,11 +310,16 @@ export class HtmlTagDefinition {
 // see http://www.w3.org/TR/html51/syntax.html#optional-tags
 // This implementation does not fully conform to the HTML5 spec.
 var TAG_DEFINITIONS: {[key: string]: HtmlTagDefinition} = {
+  'area': new HtmlTagDefinition({isVoid: true}),
+  'embed': new HtmlTagDefinition({isVoid: true}),
   'link': new HtmlTagDefinition({isVoid: true}),
   'img': new HtmlTagDefinition({isVoid: true}),
   'input': new HtmlTagDefinition({isVoid: true}),
+  'param': new HtmlTagDefinition({isVoid: true}),
   'hr': new HtmlTagDefinition({isVoid: true}),
   'br': new HtmlTagDefinition({isVoid: true}),
+  'source': new HtmlTagDefinition({isVoid: true}),
+  'track': new HtmlTagDefinition({isVoid: true}),
   'wbr': new HtmlTagDefinition({isVoid: true}),
   'p': new HtmlTagDefinition({
     closedByChildren: [
@@ -357,7 +362,7 @@ var TAG_DEFINITIONS: {[key: string]: HtmlTagDefinition} = {
   }),
   'td': new HtmlTagDefinition({closedByChildren: ['td', 'th'], closedByParent: true}),
   'th': new HtmlTagDefinition({closedByChildren: ['td', 'th'], closedByParent: true}),
-  'col': new HtmlTagDefinition({closedByChildren: ['col'], requiredParents: ['colgroup']}),
+  'col': new HtmlTagDefinition({requiredParents: ['colgroup'], isVoid: true}),
   'svg': new HtmlTagDefinition({implicitNamespacePrefix: 'svg'}),
   'math': new HtmlTagDefinition({implicitNamespacePrefix: 'math'}),
   'li': new HtmlTagDefinition({closedByChildren: ['li'], closedByParent: true}),

diff --git a/modules/angular2/test/compiler/html_parser_spec.ts b/modules/angular2/test/compiler/html_parser_spec.ts
@@ -75,6 +75,22 @@ export function main() {
               ]);
         });
 
+        it('should not error on void elements from HTML5 spec',
+           () => {
+
+               // http://www.w3.org/TR/html-markup/syntax.html#syntax-elements without:
+               // <base> - it can be present in head only
+               // <meta> - it can be present in head only
+               // <command> - obsolete
+               // <keygen> - obsolete
+
+               ['<map><area></map>', '<div><br></div>', '<colgroup><col></colgroup>',
+                '<div><embed></div>', '<div><hr></div>', '<div><img></div>', '<div><input></div>',
+                '<object><param>/<object>', '<audio><source></audio>', '<audio><track></audio>',
+                '<p><wbr></p>']
+                   .forEach(
+                       (html) => { expect(parser.parse(html, 'TestComp').errors).toEqual([]); })});
+
         it('should close void elements on text nodes', () => {
           expect(humanizeDom(parser.parse('<p>before<br>after</p>', 'TestComp')))
               .toEqual([