Incorrect backspacing of empty paragraphs in list with adjacent lists

diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabList.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabList.js
index bc4982be39a88d00084eca411c2b292672dfaef0..00ff53f8604d1f9acc05a77b0b5e9b522ea0a801 100644 (file)
--- a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabList.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabList.js
@@ -11,6 +11,34 @@ $.Redactor.prototype.WoltLabList = function() {
                                var isEmptyBlock = (block && block.tagName === 'P' && (block.innerHTML === '<br>' || block.innerHTML === ''));
                                var isBlockWrapped = ($prev.closest('ol, ul', this.core.editor()[0]).length === 1 && $next.closest('ol, ul', this.core.editor()[0]).length === 1);
                                
+                               // Special case: Caret is at an illegal `<p><br></p>` inside a list.
+                               if (isEmptyBlock) {
+                                       let hasCommonListItem = false;
+
+                                       const parent = block.parentElement;
+                                       if (parent.nodeName === "LI") {
+                                               if (
+                                                       $prev[0].parentElement === parent
+                                                       && $next[0].parentElement === parent
+                                               ) {
+                                                       hasCommonListItem = true;
+                                               }
+                                       }
+
+                                       if (hasCommonListItem) {
+                                               // In lists the previous content could be a text node.
+                                               const previousSibling = block.previousSibling;
+                                               if (previousSibling !== null) {
+                                                       this.buffer.set();
+                                                       
+                                                       block.remove();
+                                                       this.caret.end($(previousSibling));
+
+                                                       return true;
+                                               }
+                                       }
+                               }
+
                                var isEffectivelyEmptyBlock = false;
                                if (isBlockWrapped && !isEmptyBlock) {
                                        // check if the current block _is_ actually empty, but