X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fplugins%2Fhtmldataprocessor%2Fplugin.js;h=f8cf91d637b4efb90b40e29ac1def101c87f1b33;hp=c431c03a5259fd9a9e9c77b6cb304cae05cc1ef5;hb=039a051ccf3901311661022a30afd60fc38130c9;hpb=c9fdde67e6384bd5a66adc2b3bba5c4ce9db56c7

diff --git a/_source/plugins/htmldataprocessor/plugin.js b/_source/plugins/htmldataprocessor/plugin.js
index c431c03..f8cf91d 100644
--- a/_source/plugins/htmldataprocessor/plugin.js
+++ b/_source/plugins/htmldataprocessor/plugin.js
@@ -317,6 +317,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		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,6 +442,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			// 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' );
@@ -491,4 +500,3 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
  * @example
  * config.forceSimpleAmpersand = false;
  */
-CKEDITOR.config.forceSimpleAmpersand = false;