Ticket #3457: 3457_3.patch

_source/core/htmlparser/fragment.js

@@ -67 +67 @@
                         pendingInline = [],
                         pendingBRs = [],
                         currentNode = fragment,
+                    // Indicate we're inside a <textarea> element, spaces should be touched differently.
+                        inTextarea = false,
                     // Indicate we're inside a <pre> element, spaces should be touched differently.
                         inPre = false;
 
@@ -161 +163 @@
 
                         // Rtrim empty spaces on block end boundary. (#3585)
                         if ( element._.isBlockLike
-                                 && element.name != 'pre' )
+                                 && element.name != 'pre' && element.name != 'textarea' )
                         {
 
                                 var length = element.children.length,
@@ -212 +214 @@
                                 currentNode.add( new CKEDITOR.htmlParser.text( '\n' ) );
                                 return;
                         }
+                        else if ( tagName == 'textarea' )
+                                inTextarea = true;
 
                         if ( tagName == 'br' )
                         {
@@ -345 +349 @@
                                 if ( currentNode.name == 'pre' )
                                         inPre = false;
 
+                                if ( currentNode.name == 'textarea' )
+                                        inTextarea = false;
+
                                 if ( candidate._.isBlockLike )
                                         sendPendingBRs();
 
@@ -364 +371 @@
 
                 parser.onText = function( text )
                 {
-                        // Trim empty spaces at beginning of text contents except <pre>.
-                        if ( ( !currentNode._.hasInlineStarted || pendingBRs.length ) && !inPre )
+                        // Trim empty spaces at beginning of text contents except <pre> and <textarea>.
+                        if ( ( !currentNode._.hasInlineStarted || pendingBRs.length ) && !inPre && !inTextarea )
                         {
                                 text = CKEDITOR.tools.ltrim( text );
 
@@ -385 +392 @@
 
                         // Shrinking consequential spaces into one single for all elements
                         // text contents.
-                        if ( !inPre )
+                        if ( !inPre && !inTextarea )
                                 text = text.replace( /[\t\r\n ]{2,}|[\t\r\n]/g, ' ' );
 
                         currentNode.add( new CKEDITOR.htmlParser.text( text ) );