Ticket #7170: 7170.patch

_source/plugins/enterkey/plugin.js

@@ -272 +272 @@
 
                                 isPre = ( startBlockTag == 'pre' );
 
+                                // Old IEs prefer text node as line breaks.
+                                var useTextBreak = isPre && ( CKEDITOR.env.ie7Compat || CKEDITOR.env.ie6Compat );
+
                                 // Gecko prefers <br> as line-break inside <pre> (#4711).
-                                if ( isPre && !CKEDITOR.env.gecko )
+                                if ( useTextBreak )
                                         lineBreak = doc.createText( CKEDITOR.env.ie ? '\r' : '\n' );
                                 else
                                         lineBreak = doc.createElement( 'br' );
@@ -281 +284 @@
                                 range.deleteContents();
                                 range.insertNode( lineBreak );
 
-                                // IE has different behavior regarding position.
-                                if ( CKEDITOR.env.ie )
+                                // Text line-breaks has different behavior regarding position.
+                                if ( useTextBreak )
                                         range.setStartAt( lineBreak, CKEDITOR.POSITION_AFTER_END );
                                 else
                                 {
@@ -292 +295 @@
                                         doc.createText( '\ufeff' ).insertAfter( lineBreak );
 
                                         // If we are at the end of a block, we must be sure the bogus node is available in that block.
-                                        if ( isEndOfBlock )
+                                        if ( isEndOfBlock && !isPre )
                                                 lineBreak.getParent().appendBogus();
 
                                         // Now we can remove the text node contents, so the caret doesn't

_source/core/htmlparser/fragment.js

@@ -383 +383 @@
                         // text contents.
                         if ( !inPre )
                                 text = text.replace( /[\t\r\n ]{2,}|[\t\r\n]/g, ' ' );
+                        // Use <br /> instead of text line-breaks in pre-formatted block when possible.
+                        else if ( !( CKEDITOR.env.ie7Compat || CKEDITOR.env.ie6Compat ) )
+                        {
+                                // The first line-break following open tag is considered as formatter in <pre>.
+                                if ( !currentNode._.hasInlineStarted )
+                                        text = text.replace( /^(\r\n|\n)/g, '' );
 
+                                text = text.replace( /\r\n|\n/g, '<br />' );
+                        }
+
                         currentNode.add( new CKEDITOR.htmlParser.text( text ) );
                 };