Ticket #6771: 6771.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,
@@ -72 +71 @@
 
                 function checkPending( newTagName )
                 {
-                        var pendingBRsSent;
-
                         if ( pendingInline.length > 0 )
                         {
                                 for ( var i = 0 ; i < pendingInline.length ; i++ )
@@ -85 +82 @@
 
                                         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();
 
@@ -108 +99 @@
                         }
                 }
 
-                function sendPendingBRs( brsToIgnore )
-                {
-                        while ( pendingBRs.length - ( brsToIgnore || 0 ) > 0 )
-                                currentNode.add( pendingBRs.shift() );
-                }
-
                 function addElement( element, target, enforceCurrent )
                 {
                         target = target || currentNode || fragment;
@@ -196 +181 @@
                                 return;
                         }
 
-                        if ( tagName == 'br' )
-                        {
-                                pendingBRs.push( element );
-                                return;
-                        }
-
                         var currentName = currentNode.name;
 
                         var currentDtd = currentName
@@ -280 +259 @@
                         }
 
                         checkPending( tagName );
-                        sendPendingBRs();
 
                         element.parent = currentNode;
                         element.returnPoint = returnPoint;
@@ -339 +317 @@
                                 if ( currentNode.name == 'pre' )
                                         inPre = false;
 
-                                if ( candidate._.isBlockLike )
-                                        sendPendingBRs();
-
                                 addElement( candidate, candidate.parent );
 
                                 // The parent should start receiving new nodes now, except if
@@ -367 +342 @@
                                         return;
                         }
 
-                        sendPendingBRs();
                         checkPending();
 
                         if ( fixForBody
@@ -399 +373 @@
                 // Parse it.
                 parser.parse( fragmentHtml );
 
-                // Send all pending BRs except one, which we consider a unwanted bogus. (#5293)
-                sendPendingBRs( !CKEDITOR.env.ie && 1 );
-
                 // Close all pending nodes.
                 while ( currentNode.type )
                 {

_source/core/dom/range.js

@@ -922 +922 @@
                                                                 // If this is a visible element.
                                                                 // We need to check for the bookmark attribute because IE insists on
                                                                 // rendering the display:none nodes we use for bookmarks. (#3363)
-                                                                if ( sibling.$.offsetWidth > 0 && !sibling.getAttribute( '_cke_bookmark' ) )
+                                                                // <br> is invisible, don't miss it. (#4886)
+                                                                if ( sibling.$.offsetWidth > 0 && !sibling.getAttribute( '_cke_bookmark' ) || sibling.is( 'br' ) )
                                                                 {
                                                                         // We'll accept it only if we need
                                                                         // whitespace, and this is an inline
@@ -1081 +1082 @@
                                                                 // If this is a visible element.
                                                                 // We need to check for the bookmark attribute because IE insists on
                                                                 // rendering the display:none nodes we use for bookmarks. (#3363)
-                                                                if ( sibling.$.offsetWidth > 0 && !sibling.getAttribute( '_cke_bookmark' ) )
+                                                                // <br> is invisible, don't miss it. (#4886)
+                                                                if ( sibling.$.offsetWidth > 0 && !sibling.getAttribute( '_cke_bookmark' ) || sibling.is( 'br' ) )
                                                                 {
                                                                         // We'll accept it only if we need
                                                                         // whitespace, and this is an inline