Prevent possible errors when uneditable is passed through in parser

Voog · Jun 16, 2014 · 8e36a6e · 8e36a6e
1 parent 11751e1
commit 8e36a6e
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/dom/parse.js b/src/dom/parse.js
@@ -97,10 +97,12 @@ wysihtml5.dom.parse = (function() {
     while (element.firstChild) {
       firstChild = element.firstChild;
       newNode = _convert(firstChild, config.cleanUp);
-      element.removeChild(firstChild);
       if (newNode) {
         fragment.appendChild(newNode);
       }
+      if (firstChild !== newNode) {
+        element.removeChild(firstChild);
+      }
     }
 
     // Clear element contents
@@ -134,9 +136,11 @@ wysihtml5.dom.parse = (function() {
             fragment = oldNode.ownerDocument.createDocumentFragment();
 
             for (i = oldChildsLength; i--;) {
-              newChild = _convert(oldChilds[i], cleanUp);
-              if (newChild) {
-                fragment.insertBefore(newChild, fragment.firstChild);
+              if (oldChilds[i]) {
+                newChild = _convert(oldChilds[i], cleanUp);
+                if (newChild) {
+                  fragment.insertBefore(newChild, fragment.firstChild);
+                }
               }
             }
 
@@ -165,9 +169,11 @@ wysihtml5.dom.parse = (function() {
     }
 
     for (i=0; i<oldChildsLength; i++) {
-      newChild = _convert(oldChilds[i], cleanUp);
-      if (newChild) {
-        newNode.appendChild(newChild);
+      if (oldChilds[i]) {
+        newChild = _convert(oldChilds[i], cleanUp);
+        if (newChild) {
+          newNode.appendChild(newChild);
+        }
       }
     }