Merge branch 'develop'

Asana · Jul 27, 2015 · 84fe3e8 · 84fe3e8
2 parents 0b4faf5 + 18c4f42
commit 84fe3e8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/core/format.coffee b/src/core/format.coffee
@@ -85,8 +85,10 @@ class Format
     return this.remove(node) unless value
     return node if this.value(node) == value
     if _.isString(@config.parentTag)
-      parentNode = document.createElement(@config.parentTag)
-      dom(node).wrap(parentNode)
+      parentNode = node.parentNode;
+      if parentNode.tagName != @config.parentTag
+          parentNode = document.createElement(@config.parentTag)
+          dom(node).wrap(parentNode)
       if node.parentNode.tagName == node.parentNode.previousSibling?.tagName
         dom(node.parentNode.previousSibling).merge(node.parentNode)
       if node.parentNode.tagName == node.parentNode.nextSibling?.tagName