Merge pull request #327 from claire-lee/ie-list-fix

Fixing IE logic for list item deletion
Voog · May 12, 2016 · e6e9fdf · e6e9fdf
2 parents e4ca710 + 07899e8
commit e6e9fdf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/polyfills.js b/src/polyfills.js
@@ -95,7 +95,7 @@ wysihtml5.polyfills = function(win, doc) {
     };
   }
 
-  // closest and matches polyfill
+  // closest, matches, and remove polyfill
   // https://github.com/jonathantneal/closest
   (function (ELEMENT) {
     ELEMENT.matches = ELEMENT.matches || ELEMENT.mozMatchesSelector || ELEMENT.msMatchesSelector || ELEMENT.oMatchesSelector || ELEMENT.webkitMatchesSelector || function matches(selector) {
@@ -124,7 +124,14 @@ wysihtml5.polyfills = function(win, doc) {
 
       return element;
     };
-  }(Element.prototype));
+
+    ELEMENT.remove = ELEMENT.remove || function remove() {
+      if (this.parentNode) {
+        this.parentNode.removeChild(this);
+      }
+    };
+
+  }(win.Element.prototype));
 
   // Element.classList for ie8-9 (toggle all IE)
   // source http://purl.eligrey.com/github/classList.js/blob/master/classList.js

diff --git a/src/views/composer.observe.js b/src/views/composer.observe.js
@@ -120,7 +120,9 @@
         var selection = composer.selection.getSelection(),
             aNode = selection.anchorNode,
             listNode, prevNode, firstNode,
-            isInBeginnig = composer.selection.caretIsFirstInSelection();
+            isInBeginnig = composer.selection.caretIsFirstInSelection(),
+            prevNode,
+            intermediaryNode;
 
         // Fix caret at the beginnig of first textNode in LI
         if (aNode.nodeType === 3 && selection.anchorOffset === 0 && aNode === aNode.parentNode.firstChild) {
@@ -132,10 +134,16 @@
           prevNode = domNode(aNode).prev({nodeTypes: [1,3], ignoreBlankTexts: true});
           if (!prevNode && aNode.parentNode && (aNode.parentNode.nodeName === "UL" || aNode.parentNode.nodeName === "OL")) {
             prevNode = domNode(aNode.parentNode).prev({nodeTypes: [1,3], ignoreBlankTexts: true});
+            intermediaryNode = aNode.parentNode;
           }
           if (prevNode) {
             firstNode = aNode.firstChild;
             domNode(aNode).transferContentTo(prevNode, true);
+
+            if (intermediaryNode && intermediaryNode.children.length === 0){
+              intermediaryNode.remove();
+            }
+
             if (firstNode) {
               composer.selection.setBefore(firstNode);
             } else if (prevNode) {