Ticket #5595: 5595_2.patch

_source/plugins/htmldataprocessor/plugin.js

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

_source/plugins/htmlwriter/plugin.js

@@ -63 +63 @@
 
                 this._.indent = false;
                 this._.indentation = '';
+                // Indicate preformatted block context status. (#5789)
+                this._.inPre = 0;
                 this._.rules = {};
 
                 var dtd = CKEDITOR.dtd;
@@ -158 +160 @@
 
                         if ( rules && rules.breakAfterOpen )
                                 this.lineBreak();
+                        tagName == 'pre' && ( this._.inPre = 1 );
                 },
 
                 /**
@@ -206 +209 @@
                         }
 
                         this._.output.push( '</', tagName, '>' );
+                        tagName == 'pre' && ( this._.inPre = 0 );
 
                         if ( rules && rules.breakAfterClose )
                                 this.lineBreak();
@@ -223 +227 @@
                         if ( this._.indent )
                         {
                                 this.indentation();
-                                text = CKEDITOR.tools.ltrim( text );
+                                !this._.inPre  && ( text = CKEDITOR.tools.ltrim( text ) );
                         }
 
                         this._.output.push( text );
@@ -252 +256 @@
                  */
                 lineBreak : function()
                 {
-                        if ( this._.output.length > 0 )
+                        if ( !this._.inPre && this._.output.length > 0 )
                                 this._.output.push( this.lineBreakChars );
                         this._.indent = true;
                 },
@@ -267 +271 @@
                  */
                 indentation : function()
                 {
-                        this._.output.push( this._.indentation );
+                        if( !this._.inPre )
+                                this._.output.push( this._.indentation );
                         this._.indent = false;
                 },