Ticket #6629: 6629.patch

_source/plugins/enterkey/plugin.js

@@ -266 +266 @@
 
                                 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' );
@@ -276 +279 @@
                                 range.insertNode( lineBreak );
 
                                 // IE has different behavior regarding position.
-                                if ( CKEDITOR.env.ie )
+                                if ( useTextBreak )
                                         range.setStartAt( lineBreak, CKEDITOR.POSITION_AFTER_END );
                                 else
                                 {
@@ -286 +289 @@
                                         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
@@ -304 +307 @@
                                                 dummy = doc.createElement( 'span' );
                                                 // We need have some contents for Webkit to position it
                                                 // under parent node. ( #3681)
-                                                dummy.setHtml('&nbsp;');
+                                                dummy.setHtml( '&nbsp;' );
                                         }
                                         else
                                                 dummy = doc.createElement( 'br' );
@@ -337 +340 @@
                 // 1. We want to enforce the mode to be respected, instead
                 // of cloning the current block. (#77)
                 // 2. Always perform a block break when inside <pre> (#5402).
-                if ( editor.getSelection().getStartElement().hasAscendant( 'pre', true ) )
-                {
-                        setTimeout( function() { enterBlock( editor, editor.config.enterMode, null, true ); }, 0 );
-                        return true;
-                }
-                else
-                        return enter( editor, editor.config.shiftEnterMode, 1 );
+                return enter( editor, editor.config.shiftEnterMode, 1 );
         }
 
         function enter( editor, mode, forceMode )
@@ -361 +358 @@
                 setTimeout( function()
                         {
                                 editor.fire( 'saveSnapshot' );  // Save undo step.
-                                if ( mode == CKEDITOR.ENTER_BR || editor.getSelection().getStartElement().hasAscendant( 'pre', 1 ) )
+                                if ( mode == CKEDITOR.ENTER_BR )
                                         enterBr( editor, mode, null, forceMode );
                                 else
                                         enterBlock( editor, mode, null, forceMode );

_source/core/htmlparser/fragment.js

@@ -383 +383 @@
                         // text contents.
                         if ( !inPre )
                                 text = text.replace( /[\t\r\n ]{2,}|[\t\r\n]/g, ' ' );
+                        // Old IEs cannot use <br /> line-breaks in pre-formatted block.
+                        else if ( !( CKEDITOR.env.ie7Compat || CKEDITOR.env.ie6Compat ) )
+                        {
+                                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 ) );
                 };