Ticket #6984: 6984.patch

_source/core/htmlparser/fragment.js

@@ -108 +108 @@
                         }
                 }
 
-                function sendPendingBRs( brsToIgnore )
+                function sendPendingBRs()
                 {
-                        while ( pendingBRs.length - ( brsToIgnore || 0 ) > 0 )
+                        while ( pendingBRs.length )
                                 currentNode.add( pendingBRs.shift() );
                 }
 

_source/plugins/wysiwygarea/plugin.js

@@ -313 +313 @@
                 var win = editor.window,
                         doc = editor.document,
                         body = editor.document.getBody(),
+                        bodyFirstChild = body.getFirst(),
                         bodyChildsNum = body.getChildren().count();
 
-                if ( !bodyChildsNum || ( bodyChildsNum == 1&& body.getFirst().hasAttribute( '_moz_editor_bogus_node' ) ) )
+                if ( !bodyChildsNum
+                        || bodyChildsNum == 1
+                                && bodyFirstChild.type == CKEDITOR.NODE_ELEMENT
+                                && bodyFirstChild.hasAttribute( '_moz_editor_bogus_node' ) )
                 {
                         restoreDirty( editor );
 
@@ -981 +985 @@
                                                                                 '</html>';
                                                                 }
 
+                                                                // Distinguish bogus to normal BR at the end of document for Mozilla. (#5293).
+                                                                if ( CKEDITOR.env.gecko )
+                                                                        data = data.replace( /<br \/>(?=\s*<\/(:?html|body)>)/, '$&<br type="_moz" />' );
+
                                                                 data += activationScript;
 
 
@@ -1000 +1008 @@
                                                                         ? doc.getDocumentElement().getOuterHtml()
                                                                         : doc.getBody().getHtml();
 
+                                                                // BR at the end of document is bogus node for Mozilla. (#5293).
+                                                                if ( CKEDITOR.env.gecko )
+                                                                        data = data.replace( /<br>(?=\s*(:?$|<\/body>))/, '' );
+
                                                                 if ( editor.dataProcessor )
                                                                         data = editor.dataProcessor.toDataFormat( data, fixForBody );