Ticket #4656: 4656.patch

_source/core/htmlparser/element.js

@@ -35 +35 @@
         this.children = [];
 
         var dtd                 = CKEDITOR.dtd,
-                isBlockLike     = !!( dtd.$block[ name ] || dtd.$listItem[ name ] || dtd.$tableContent[ name ] || dtd.$nonEditable ),
+                isBlockLike     = !!( dtd.$block[ name ] || dtd.$listItem[ name ] || dtd.$tableContent[ name ] || dtd.$nonEditable[ name ] ),
                 isEmpty         = !!dtd.$empty[ name ];
 
         this.isEmpty    = isEmpty;

_test/dt/core/htmlparser/htmlparser.html

@@ -69 +69 @@
                                 htmlParse( getTextAreaValue( 'htmlOriginal3' ) ),
                                 'Attributes doesn\'t match.' );
                 },
-                
+
+                // Test white-spaces inside inline elements are well preserved, while
+                // white-spaces before block-level elements are trimmed. (#4656)
+                test_trim_whitespaces : function()
+                {
+                        assert.areSame( '<div>some <strong>bold</strong> text<p>paragraph</p></div>',
+                                htmlParse( '<div>some <strong>bold</strong> text <p>\nparagraph</p></div>' ),
+                                'White-spaces doesn\'t match.' );
+                },
+
                 name :document.title
         };
 } )() );