Ticket #4886: 4886_3.patch

_source/core/htmlparser/fragment.js

@@ -64 +64 @@
                         html = [],
                         fragment = new CKEDITOR.htmlParser.fragment(),
                         pendingInline = [],
+                        pendingBRs = [],
                         currentNode = fragment,
                     // Indicate we're inside a <pre> element, spaces should be touched differently.
                         inPre = false,
@@ -71 +72 @@
 
                 function checkPending( newTagName )
                 {
+                        var pendingBRsSent;
+
                         if ( pendingInline.length > 0 )
                         {
                                 for ( var i = 0 ; i < pendingInline.length ; i++ )
@@ -82 +85 @@
 
                                         if ( ( !currentDtd || currentDtd[ pendingName ] ) && ( !newTagName || !pendingDtd || pendingDtd[ newTagName ] || !CKEDITOR.dtd[ newTagName ] ) )
                                         {
+                                                if ( !pendingBRsSent )
+                                                {
+                                                        sendPendingBRs();
+                                                        pendingBRsSent = 1;
+                                                }
+
                                                 // Get a clone for the pending element.
                                                 pendingElement = pendingElement.clone();
 
@@ -99 +108 @@
                         }
                 }
 
+                function sendPendingBRs()
+                {
+                        while ( pendingBRs.length )
+                                currentNode.add( pendingBRs.shift() );
+                }
+
                 function addElement( element, target, enforceCurrent )
                 {
                         target = target || currentNode || fragment;
@@ -181 +196 @@
                                 return;
                         }
 
+                        if ( tagName == 'br' )
+                        {
+                                pendingBRs.push( element );
+                                return;
+                        }
+
                         var currentName = currentNode.name;
 
                         var currentDtd = currentName
@@ -308 +329 @@
 
                                 currentNode = candidate;
 
-                                if( currentNode.name == 'pre' )
+                                if ( currentNode.name == 'pre' )
                                         inPre = false;
 
+                                if ( candidate._.isBlockLike )
+                                        sendPendingBRs();
+
                                 addElement( candidate, candidate.parent );
 
                                 // The parent should start receiving new nodes now, except if
@@ -321 +345 @@
                                 pendingInline = pendingInline.concat( newPendingInline );
                         }
 
-                        if( tagName == 'body' )
+                        if ( tagName == 'body' )
                                 fixForBody = false;
                 };
 
@@ -336 +360 @@
                                         return;
                         }
 
+                        sendPendingBRs();
                         checkPending();
 
                         if ( fixForBody
@@ -366 +391 @@
                 // Parse it.
                 parser.parse( fragmentHtml );
 
+                sendPendingBRs();
+
                 // Close all pending nodes.
                 while ( currentNode.type )
                 {