tHTML: handle mixed text/element nodes in top level

openstyles · Aug 18, 2017 · 21b2ba5 · 21b2ba5
1 parent 6625cd4
commit 21b2ba5
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/js/localization.js b/js/localization.js
@@ -23,21 +23,22 @@ function tHTML(html, tag) {
     return document.createTextNode(html);
   }
   if (typeof html === 'string') {
-    html = html.replace(/>\s+</g, '><'); // spaces are removed; use &nbsp; for an explicit space
+    // spaces are removed; use &nbsp; for an explicit space
+    html = html.replace(/>\s+</g, '><').trim();
     if (tag) {
       html = `<${tag}>${html}</${tag}>`;
     }
     const body = t.DOMParser.parseFromString(html, 'text/html').body;
     if (html.includes('i18n-')) {
       tNodeList(body.getElementsByTagName('*'));
     }
-    // the html string may contain more than one top-level elements
-    if (body.childElementCount <= 1) {
-      return body.firstElementChild;
+    // the html string may contain more than one top-level node
+    if (!body.childNodes[1]) {
+      return body.firstChild;
     }
     const fragment = document.createDocumentFragment();
-    while (body.childElementCount) {
-      fragment.appendChild(body.firstElementChild);
+    while (body.firstChild) {
+      fragment.appendChild(body.firstChild);
     }
     return fragment;
   }