handle comments and childless elements

fixes slab#89
phamtrisi · May 11, 2014 · 631100c · 631100c
1 parent 85890d8
commit 631100c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/document.coffee b/src/document.coffee
@@ -102,6 +102,7 @@ class Document
     @lines.remove(line)
 
   setHTML: (html) ->
+    html = Normalizer.stripComments(html)
     html = Normalizer.stripWhitespace(html)
     @root.innerHTML = html
     @lines = new LinkedList()

diff --git a/src/normalizer.coffee b/src/normalizer.coffee
@@ -104,6 +104,9 @@ Normalizer =
         break
       curNode = curNode.nextSibling
 
+  stripComments: (html) ->
+    html = html.replace(/<!--[\s\S]*?-->/g, '')
+
   stripWhitespace: (html) ->
     # Remove leading and tailing whitespace
     html = html.replace(/^\s+/, '').replace(/\s+$/, '')
@@ -123,15 +126,15 @@ Normalizer =
         node.removeAttribute('style')
 
   whitelistTags: (node) ->
-    return unless DOM.isElement(node)
+    return node unless DOM.isElement(node)
     node = DOM.switchTag(node, Normalizer.ALIASES[node.tagName]) if Normalizer.ALIASES[node.tagName]?
     if !Normalizer.TAGS[node.tagName]?
       if DOM.BLOCK_TAGS[node.tagName]?
         node = DOM.switchTag(node, DOM.DEFAULT_BLOCK_TAG)
-      else if node.hasAttributes()
-        node = DOM.switchTag(node, DOM.DEFAULT_INLINE_TAG)
-      else
+      else if !node.hasAttributes() and node.firstChild?
         node = DOM.unwrap(node)
+      else
+        node = DOM.switchTag(node, DOM.DEFAULT_INLINE_TAG)
     return node
 
   # Wrap inline nodes with block tags

diff --git a/test/unit/document.coffee b/test/unit/document.coffee
@@ -288,6 +288,13 @@ describe('Document', ->
         <p><b></b><br></p>
       ', true)
     )
+
+    it('setHTML() with comment', ->
+      @doc.setHTML('
+        <!-- HTML Comment -->
+        <p>Test</p>
+      ')
+    )
   )
 
   describe('toDelta()', ->