Ticket #5487: 5487.patch

_source/plugins/wysiwygarea/plugin.js

@@ -14 +14 @@
         var nonExitableElementNames = { table:1,pre:1 };
 
         // Matching an empty paragraph at the end of document.
-        var emptyParagraphRegexp = /\s*<(p|div|address|h\d|center)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\1>)?\s*(?=$|<\/body>)/gi;
+        var emptyParagraphRegexp = /<(p|div|address|h\d|center)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\1>)?(\s*)(?=$|<\/body>)/gi;
 
         function onInsertHtml( evt )
         {
@@ -698 +698 @@
                                                                 if ( editor.dataProcessor )
                                                                         data = editor.dataProcessor.toDataFormat( data, fixForBody );
 
-                                                                // Strip the last blank paragraph within document.
+                                                                // Strip the last blank paragraph within document while preserve any whitespaces around.
                                                                 if ( config.ignoreEmptyParagraph )
-                                                                        data = data.replace( emptyParagraphRegexp, '' );
+                                                                        data = data.replace( emptyParagraphRegexp, '$3' );
 
                                                                 if ( docType )
                                                                         data = docType + '\n' + data;