Ticket #6925: 6925.patch

_source/plugins/htmldataprocessor/plugin.js

@@ -527 +527 @@
                 toDataFormat : function( html, fixForBody )
                 {
                         var writer = this.writer,
-                                fragment = CKEDITOR.htmlParser.fragment.fromHtml( html, fixForBody );
+                                fragment = CKEDITOR.htmlParser.fragment.fromHtml( html, fixForBody, 1 );
 
                         writer.reset();
 

_source/core/htmlparser/fragment.js

@@ -58 +58 @@
          * alert( fragment.children[0].name );  "b"
          * alert( fragment.children[1].value );  " Text"
          */
-        CKEDITOR.htmlParser.fragment.fromHtml = function( fragmentHtml, fixForBody )
+        CKEDITOR.htmlParser.fragment.fromHtml = function( fragmentHtml, fixForBody, noSpacesFix )
         {
                 var parser = new CKEDITOR.htmlParser(),
                         html = [],
@@ -156 +156 @@
                                         text;
                                 if ( lastChild && lastChild.type == CKEDITOR.NODE_TEXT )
                                 {
-                                        if ( !( text = CKEDITOR.tools.rtrim( lastChild.value ) ) )
+                                        if ( !( text = noSpacesFix ? lastChild.value : CKEDITOR.tools.rtrim( lastChild.value ) ) )
                                                 element.children.length = length -1;
                                         else
                                                 lastChild.value = text;
@@ -176 +176 @@
                 {
                         var element = new CKEDITOR.htmlParser.element( tagName, attributes );
 
+                        element._.spacesFix = !noSpacesFix;
+
                         // "isEmpty" will be always "false" for unknown elements, so we
                         // must force it if the parser has identified it as a selfClosing tag.
                         if ( element.isUnknown && selfClosing )
@@ -358 +360 @@
                 parser.onText = function( text )
                 {
                         // Trim empty spaces at beginning of element contents except <pre>.
-                        if ( !currentNode._.hasInlineStarted && !inPre )
+                        if ( !( noSpacesFix  || currentNode._.hasInlineStarted ) && !inPre )
                         {
                                 text = CKEDITOR.tools.ltrim( text );
 
@@ -371 +373 @@
 
                         if ( fixForBody
                                  && ( !currentNode.type || currentNode.name == 'body' )
-                                 && CKEDITOR.tools.trim( text ) )
+                                 && ( noSpacesFix || CKEDITOR.tools.trim( text ) ) )
                         {
                                 this.onTagOpen( fixForBody, {} );
                         }
@@ -439 +441 @@
                         var len = this.children.length,
                                 previous = len > 0 && this.children[ len - 1 ] || null;
 
-                        if ( previous )
+                        if ( this._.spacesFix && previous )
                         {
                                 // If the block to be appended is following text, trim spaces at
                                 // the right of it.
                                 if ( node._.isBlockLike && previous.type == CKEDITOR.NODE_TEXT )
                                 {
-                                        previous.value = CKEDITOR.tools.rtrim( previous.value );
+                                        previous.value = previous.value;
 
                                         // If we have completely cleared the previous node.
                                         if ( previous.value.length === 0 )