Merge branch 'fix/all-whitespace-text'

Author: rayd

lib/parse.js

@@ -3,6 +3,20 @@ var tagRE = /<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>/g;
 var parseTag = require('./parse-tag');
 // re-used obj for quick lookups of components
 var empty = Object.create ? Object.create(null) : {};
+// common logic for pushing a child node onto a list
+function pushTextNode(list, html, start) {
+    // calculate correct end of the content slice in case there's
+    // no tag after the text node.
+    var end = html.indexOf('<', start);
+    var content = html.slice(start, end === -1 ? undefined : end);
+    // if a node is nothing but whitespace, no need to add it.
+    if (!/^\s*$/.test(content)) {
+        list.push({
+            type: 'text',
+            content: content
+        });
+    }
+}
 
 module.exports = function parse(html, options) {
     options || (options = {});
@@ -37,10 +51,7 @@ module.exports = function parse(html, options) {
             }
 
             if (!current.voidElement && !inComponent && nextChar && nextChar !== '<') {
-                current.children.push({
-                    type: 'text',
-                    content: html.slice(start, html.indexOf('<', start))
-                });
+                pushTextNode(current.children, html, start);
             }
 
             byTag[current.tagName] = current;
@@ -66,18 +77,7 @@ module.exports = function parse(html, options) {
                 // if we're at the root, push a base text node. otherwise add as
                 // a child to the current node.
                 parent = level === -1 ? result : arr[level].children;
-
-                // calculate correct end of the content slice in case there's
-                // no tag after the text node.
-                var end = html.indexOf('<', start);
-                var content = html.slice(start, end === -1 ? undefined : end);
-                // if a node is nothing but whitespace, no need to add it.
-                if (!/^\s*$/.test(content)) {
-                    parent.push({
-                        type: 'text',
-                        content: content
-                    });
-                }
+                pushTextNode(parent, html, start);
             }
         }
     });

test/parse.js

@@ -347,7 +347,7 @@ test('parse', function (t) {
         type: 'text', content: 'else '
     }], 'should handle text nodes in the middle of tags at the top-level');
 
-    html = '<div>Hi</div>\n\n <span>There</span> \t ';
+    html = '<div>Hi</div>\n\n <span>There</span> \t <iframe>\n\t</iframe>';
     parsed = HTML.parse(html);
     t.deepEqual(parsed, [{
         type: 'tag',
@@ -365,6 +365,12 @@ test('parse', function (t) {
         children: [
             { type: 'text', content: 'There' }
         ]
+    },{
+        type: 'tag',
+        name: 'iframe',
+        attrs: {},
+        voidElement: false,
+        children: []
     }], 'should remove text nodes that are nothing but whitespace');
     t.end();
 });