Ticket #3585: 3585_3.patch

_source/tests/core/htmlparser/fragment.html

@@ -151 +151 @@
                                                 '<p><b>Test</b></p><script type="test">var a = "<A Href=xxx>Testing</ A>";\nGo();<\/script>' );
                 },
 
+                test_ticket_3585 : function()
+                {
+                        testParser(     '<p><br />\t\r\n</p>',
+                                                '<p><br /></p>' );
+                },
+
+                test_ticket_3585_1 : function()
+                {
+                        testParser(     '<p><br />text\t\r\n</p>',
+                                                '<p><br />text</p>' );
+                },
+
+
+                test_ticket_3585_2 : function()
+                {
+                        testParser(     '<b>inline </b>\n<p>paragraph\t\r\n</p>\t\r\n',
+                                                '<p><b>inline </b></p><p>paragraph</p>' );
+                },
+
                 name : document.title
         };
 })() );
 
 // Uncomment the following to run a single test.
-// window.onload = tc.test_ticket_3195_2;
+// window.onload = tc.test_ticket_3585_2;
 
         //]]>
         </script>

_source/core/htmlparser/fragment.js

@@ -116 +116 @@
                                         currentNode = savedCurrent;
                         }
 
+                        // Rtrim empty spaces on block end boundary. (#3585)
+                        if ( element._.isBlockLike )
+                        {
+
+                                var length = element.children.length,
+                                        lastChild = element.children[ length - 1 ],
+                                        text;
+                                if ( lastChild && lastChild.type == CKEDITOR.NODE_TEXT )
+                                {
+                                        if ( !( text = CKEDITOR.tools.rtrim( lastChild.value ) ) )
+                                                element.children.length = length -1;
+                                        else
+                                                lastChild.value = text;
+                                }
+                        }
+
                         target.add( element );
 
                         if ( element.returnPoint )