Ticket #4344: 4344.patch

_tests/dt/plugins/htmldataprocessor/htmldataprocessor.html

@@ -224 +224 @@
                         assert.areSame( expected, dataProcessor.toHtml( '<p>Some text<br></p>' ));
                 },
 
+                test_toHtml_ticket_2886_5 : function()
+                {
+                        var dataProcessor = CKEDITOR.instances.editor1.dataProcessor;
+                        assert.areSame( '<p>\n\t<br />\n\t&nbsp;</p>\n',
+                                dataProcessor.toDataFormat( dataProcessor.toHtml( '<p><br />\n<br /></p>' ) ) );
+                },
+
                 test_ticket_3407 : function()
                 {
                         var editor = CKEDITOR.instances.editor1,

_source/plugins/htmldataprocessor/plugin.js

@@ -11 +11 @@
 
         var protectedSourceMarker = '{cke_protected}';
 
+
+        // Return the last non-space child node of the block (#4344).
+        function lastNoneSpaceChild( block )
+        {
+                var lastIndex = block.children.length,
+                        last = block.children[ lastIndex - 1 ];
+                while(  last && last.type == CKEDITOR.NODE_TEXT && !CKEDITOR.tools.trim( last.value ) )
+                        last = block.children[ --lastIndex ];
+                return last || null;
+        }
+        
         function trimFillers( block, fromSource )
         {
                 // If the current node is a block, and if we're converting from source or
@@ -18 +29 @@
                 //
                 // Also, any   at the end of blocks are fillers, remove them as well.
                 // (#2886)
-                var children = block.children;
-                var lastChild = children[ children.length - 1 ];
+                var children = block.children, lastChild = lastNoneSpaceChild( block );
                 if ( lastChild )
                 {
                         if ( ( fromSource || !CKEDITOR.env.ie ) && lastChild.type == CKEDITOR.NODE_ELEMENT && lastChild.name == 'br' )
@@ -31 +41 @@
 
         function blockNeedsExtension( block )
         {
-                if ( block.children.length < 1 )
-                        return true;
-
-                var lastChild = block.children[ block.children.length - 1 ];
-                return lastChild.type == CKEDITOR.NODE_ELEMENT && lastChild.name == 'br';
+                var lastChild = lastNoneSpaceChild( block );
+                return !lastChild || lastChild.type == CKEDITOR.NODE_ELEMENT && lastChild.name == 'br';
         }
 
         function extendBlockForDisplay( block )