Ticket #3949: 3949_2.patch

_source/plugins/enterkey/plugin.js

@@ -262 +262 @@
                         // We need some text inside of it, so the bogus <br> is properly
                         // created.
                         if ( !CKEDITOR.env.ie )
+                        {
                                 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 && !CKEDITOR.env.ie )
-                                lineBreak.getParent().appendBogus();
-
-                        // Now we can remove the text node contents, so the caret doesn't
-                        // stop on it.
-                        if ( !CKEDITOR.env.ie )
+                                // If we are at the end of a block, we must be sure the bogus node is available in that block.
+                                if ( isEndOfBlock )
+                                        lineBreak.getParent().appendBogus();
+                                // Now we can remove the text node contents, so the caret doesn't
+                                // stop on it.
                                 lineBreak.getNext().$.nodeValue = '';
+                        }
+                        // IE need to 'refresh' to properly display the line-break in <pre> (#3949).
+                        else if ( isPre )
+                        {
+                                editor.execCommand( 'blur' );
+                                setTimeout( function(){
+                                        editor.execCommand( 'blurBack' );
+                                }, 0 );
+                        }
+
                         // IE has different behavior regarding position.
                         if ( CKEDITOR.env.ie )
                                 range.setStartAt( lineBreak, CKEDITOR.POSITION_AFTER_END );

_source/plugins/selection/plugin.js

@@ -491 +491 @@
                                                 }
 
                                                 testRange.setEndPoint( 'StartToStart', range );
-                                                var distance = testRange.text.length;
+                                                // IE report line break as CRLF with range.text but
+                                                // only LF with textnode.nodeValue, normalize them to avoid
+                                                // breaking character counting logic below. (#3949)
+                                                var distance = testRange.text.replace( /(\r\n|\r)/g, '\n' ).length;
 
                                                 while ( distance > 0 )
                                                         distance -= siblings[ --i ].nodeValue.length;

CHANGES.html

@@ -130 +130 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3742">#3742</a> : Fixed wrong dialog layout for dialogs without tab bar in IE RTL mode .</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3671">#3671</a> : Fixed body fixing should be applied to the real type under fake elements.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3836">#3836</a> : Fixed remove list in enterMode=BR will merge sibling text to one line.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3949">#3949</a> : Fixed enterKey within pre-formatted text introduce wrong line-break.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>