Fixed handling of empty but formatted lines

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
index 42f51e7de7421b7b3800a95037e2610dd893ed6d..952aef76f29c82f10aee5687b897a5b68725b67e 100644 (file)
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
@@ -1718,17 +1718,53 @@ RedactorPlugins.wbbcode = function() {
                 * @param       object          data
                 */
                _keyupCallback: function(data) {
-                       if (data.event.which !== $.ui.keyCode.BACKSPACE && data.event.which !== $.ui.keyCode.DELETE) {
-                               return;
+                       switch (data.event.which) {
+                               case $.ui.keyCode.BACKSPACE:
+                               case $.ui.keyCode.DELETE:
+                                       // check for empty <blockquote>
+                                       this.$editor.find('blockquote').each(function(index, blockquote) {
+                                               var $blockquote = $(blockquote);
+                                               if (!$blockquote.children('header').length) {
+                                                       $blockquote.remove();
+                                               }
+                                       });
+                               break;
+                               
+                               case $.ui.keyCode.ENTER:
+                                       // fix markup for empty lines
+                                       for (var $i = 0, $length = this.$editor[0].children.length; $i < $length; $i++) {
+                                               var $child = this.$editor[0].children[$i];
+                                               if ($child.nodeType !== Node.ELEMENT_NODE || $child.tagName !== 'P') {
+                                                       // not a <p> element
+                                                       continue;
+                                               }
+                                               
+                                               if ($child.textContent.length > 0) {
+                                                       // element is non-empty
+                                                       continue;
+                                               }
+                                               
+                                               if ($child.children.length > 1 || $child.children[0].tagName === 'BR') {
+                                                       // element contains more than one children or it is just a <br>
+                                                       continue;
+                                               }
+                                               
+                                               // head all the way down to the most inner node
+                                               $child = $child.children[0];
+                                               while ($child.children.length === 1) {
+                                                       $child = $child.children[0];
+                                               }
+                                               
+                                               // check if node has no children and it is a <br>
+                                               if ($child.children.length === 0 && $child.tagName === 'BR') {
+                                                       var $parent = $child.parentNode;
+                                                       var $node = document.createTextNode('\u200b');
+                                                       $parent.appendChild($node);
+                                                       $parent.removeChild($child);
+                                               }
+                                       }
+                               break;
                        }
-                       
-                       // check for empty <blockquote
-                       this.$editor.find('blockquote').each(function(index, blockquote) {
-                               var $blockquote = $(blockquote);
-                               if (!$blockquote.children('header').length) {
-                                       $blockquote.remove();
-                               }
-                       });
                },
                
                /**

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wutil.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wutil.js
index 0ecb0fc07142d6886121dee17f5e3fe5364b8e21..8a29c9b160f26c7ffaa83ee4d49cabd078d8acf5 100644 (file)
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wutil.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wutil.js
@@ -994,6 +994,37 @@ RedactorPlugins.wutil = function() {
                                        }
                                }
                        }
+                       
+                       // fix markup for empty lines
+                       for (var $i = 0, $length = this.$editor[0].children.length; $i < $length; $i++) {
+                               var $child = this.$editor[0].children[$i];
+                               if ($child.nodeType !== Node.ELEMENT_NODE || $child.tagName !== 'P') {
+                                       // not a <p> element
+                                       continue;
+                               }
+                               
+                               if ($child.textContent.length > 0) {
+                                       // element is non-empty
+                                       continue;
+                               }
+                               
+                               if ($child.children.length > 1 || $child.children[0].tagName === 'BR') {
+                                       // element contains more than one children or it is just a <br>
+                                       continue;
+                               }
+                               
+                               // head all the way down to the most inner node
+                               $child = $child.children[0];
+                               while ($child.children.length === 1) {
+                                       $child = $child.children[0];
+                               }
+                               
+                               
+                               if ($child.childNodes.length === 0 && $child.tagName !== 'BR') {
+                                       var $node = document.createTextNode('\u200b');
+                                       $child.appendChild($node);
+                               }
+                       }
                }
        };
 };