Ticket #7087: 7087_3.patch

_source/core/dom/walker.js

@@ -436 +436 @@
                 {
                         return isBookmark( node )
                                         || isWhitespaces( node )
-                                        || node.type == CKEDITOR.NODE_ELEMENT && node.getName() in CKEDITOR.dtd.$removeEmpty;
+                                        || node.type == CKEDITOR.NODE_ELEMENT
+                                        && node.getName() in CKEDITOR.dtd.$inline
+                                        && !( node.getName() in CKEDITOR.dtd.$empty );
                 };
 
         // Check if there's a filler node at the end of an element, and return it.
         CKEDITOR.dom.element.prototype.getBogus = function()
         {
-                // Bogus are not always at the end, e.g. <p><strong>text<br /></strong></p> (#7070).
+                // Bogus are not always at the end, e.g. <p><a>text<br /></a></p> (#7070).
                 var tail = this;
                 do { tail = tail.getPreviousSourceNode(); }
                 while ( toSkip( tail ) )

_source/plugins/styles/plugin.js

@@ -430 +430 @@
                 var dtd = CKEDITOR.dtd[ elementName ] || ( isUnknownElement = true, CKEDITOR.dtd.span );
 
                 // Expand the range.
-                range.enlarge( CKEDITOR.ENLARGE_ELEMENT );
+                range.enlarge( CKEDITOR.ENLARGE_ELEMENT, 1 );
                 range.trim();
 
                 // Get the first node to be processed and the last, which concludes the
@@ -657 +657 @@
                  * Make sure our range has included all "collpased" parent inline nodes so
                  * that our operation logic can be simpler.
                  */
-                range.enlarge( CKEDITOR.ENLARGE_ELEMENT );
+                range.enlarge( CKEDITOR.ENLARGE_ELEMENT, 1 );
 
                 var bookmark = range.createBookmark(),
                         startNode = bookmark.startNode;

_source/core/dom/range.js

@@ -823 +823 @@
                         }
                 },
 
-                enlarge : function( unit )
+                enlarge : function( unit, excludeBrs )
                 {
                         switch ( unit )
                         {
@@ -944 +944 @@
                                                                 // 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.data( 'cke-bookmark' ) )
+                                                                // Line-breaks (br) are rendered with zero width, which we don't want to include. (#7041)
+                                                                if ( ( sibling.$.offsetWidth > 0 || excludeBrs && sibling.is( 'br' ) ) && !sibling.data( 'cke-bookmark' ) )
                                                                 {
                                                                         // We'll accept it only if we need
                                                                         // whitespace, and this is an inline
@@ -1079 +1080 @@
                                                                 if ( commonReached )
                                                                         endTop = enlargeable;
                                                                 else if ( enlargeable )
-                                                                {
-                                                                        var bogus = enlargeable.isBlockBoundary() && enlargeable.getBogus();
-
-                                                                        // Exclude bogus <br /> at the end of block.
-                                                                        if ( bogus )
-                                                                                this.setEndBefore( bogus );
-                                                                        else
-                                                                                this.setEndAfter( enlargeable );
-                                                                }
-                                                        }
+                                                                        this.setEndAfter( enlargeable );
+                                                        }
 
                                                         sibling = enlargeable.getNext();
                                                 }
@@ -1111 +1104 @@
                                                                 // 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.data( 'cke-bookmark' ) )
+                                                                // Line-breaks (br) are rendered with zero width, which we don't want to include. (#7041)
+                                                                if ( ( sibling.$.offsetWidth > 0 || excludeBrs && sibling.is( 'br' ) ) && !sibling.data( 'cke-bookmark' ) )
                                                                 {
                                                                         // We'll accept it only if we need
                                                                         // whitespace, and this is an inline