Strip trailing `<br>` from links in Firefox

diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabKeydown.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabKeydown.js
index e542e7be1d63f83a60e3348575b837343aa0a9f2..1592e4cf079cb392a1e4aabe8c6ab259c7311a97 100644 (file)
--- a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabKeydown.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabKeydown.js
@@ -303,9 +303,37 @@ $.Redactor.prototype.WoltLabKeydown = function() {
                                }
                                // paragraphs
                                else if (this.keydown.block) {
+                                       // Firefox has the habit of keeping pointless `<br>` at the end of lines, which are mostly
+                                       // just a bit of noise. However, external links have an icon inserted behind them that is
+                                       // affected by the line break, effectively rendering it on the next line.
+                                       var firefoxCheckForArbitraryBrElement = null;
+                                       if (this.detect.isFirefox() && this.keydown.block.nodeName === 'P' && selection.isCollapsed) {
+                                               var link = elClosest(selection.getRangeAt(0).startContainer, 'a');
+                                               if (link !== null && elBySel('br', link) === null) {
+                                                       firefoxCheckForArbitraryBrElement = this.keydown.block;
+                                               }
+                                       }
+                                       
                                        setTimeout($.proxy(function () {
                                                this.keydown.replaceToParagraph('DIV');
                                                
+                                               // The target element was previously the original element at the time of the keypress,
+                                               // but is now the paragraph element of the next line. That said, we simply check the
+                                               // previous paragraph for a trailing link with a superfluous `<br>` element.
+                                               if (firefoxCheckForArbitraryBrElement !== null && firefoxCheckForArbitraryBrElement.previousElementSibling !== null) {
+                                                       var links = [];
+                                                       elBySelAll('a', firefoxCheckForArbitraryBrElement.previousElementSibling, function(link) {
+                                                               links.push(link);
+                                                       });
+                                                       
+                                                       if (links.length) {
+                                                               var link = links[links.length - 1];
+                                                               var br = elBySel('br', link);
+                                                               if (br !== null) {
+                                                                       elRemove(br);
+                                                               }
+                                                       }
+                                               }
                                        }, this), 1);
                                        
                                        // empty list exit
@@ -326,7 +354,6 @@ $.Redactor.prototype.WoltLabKeydown = function() {
                                                        }
                                                }
                                        }
-                                       
                                }
                                // outside
                                else if (!this.keydown.block) {