Ticket #5789: 5789.patch

_source/plugins/htmlwriter/plugin.js

@@ -99 +99 @@
                 // Disable indentation on <pre>.
                 this.setRules( 'pre',
                         {
-                          indent: false
+                                indent: false,
+                                breakAfterOpen : false
                         });
         },
 

_source/plugins/wysiwygarea/plugin.js

@@ -719 +719 @@
                                                                                 '</html>';
                                                                 }
 
+                                                                // Compensate one leading line break for <pre> as browsers
+                                                                // are ignoring the first line-break in front of it. (#5789)
+                                                                data = data.replace( /(<pre>)(\r\n|\n)/g, '$1$2$2' );
                                                                 data += activationScript;
 
 

_source/plugins/htmldataprocessor/plugin.js

@@ -302 +302 @@
                 return html.replace( protectSelfClosingRegex, '<cke:$1$2></cke:$1>' );
         }
 
+        function protectPreFormatted( html )
+        {
+                return html.replace( /(<pre>)(\r\n|\n)/g, '$1$2$2' );
+        }
+
         function protectRealComments( html )
         {
                 return html.replace( /<!--(?!{cke_protected})[\s\S]+?-->/g, function( match )
@@ -422 +427 @@
                         // protecting them into open-close. (#3591)
                         data = protectSelfClosingElements( data );
 
+                        // Compensate one leading line break for <pre> as browsers
+                        // are ignoring the first line-break in front of it. (#5789)
+                        data = protectPreFormatted( data );
+
                         // Call the browser to help us fixing a possibly invalid HTML
                         // structure.
                         var div = new CKEDITOR.dom.element( 'div' );