Ticket #7041: 7041_2.patch

_source/core/dom/element.js

@@ -254 +254 @@
                 },
 
                 /**
-                * Retrieve block element's filler node if existed.
-                */
-                getBogus : function()
-                {
-                        if ( !this.isBlockBoundary() )
-                                return null;
-
-                        var lastChild = this.getLast();
-
-                        // Ignore empty/spaces text.
-                        while ( lastChild && lastChild.type == CKEDITOR.NODE_TEXT
-                                        && !CKEDITOR.tools.rtrim( lastChild.getText() ) )
-                                lastChild = lastChild.getPrevious();
-
-                        if ( lastChild &&
-                                        ( CKEDITOR.env.ie && lastChild.type == CKEDITOR.NODE_TEXT
-                                                        && CKEDITOR.tools.trim( lastChild.getText() ).match( /^(?: |\xa0)$/ )
-                                                        || CKEDITOR.env.gecko && CKEDITOR.env.webkit && lastChild.is( 'br' ) ) )
-                        {
-                                return lastChild;
-                        }
-
-                        return null;
-                },
-
-                /**
                  * Breaks one of the ancestor element in the element position, moving
                  * this element between the broken parts.
                  * @param {CKEDITOR.dom.element} parent The anscestor element to get broken.

_source/plugins/wysiwygarea/plugin.js

@@ -357 +357 @@
                         body = editor.document.getBody(),
                         enterMode = editor.config.enterMode;
 
-                CKEDITOR.env.gecko && activateEditing( editor );
+                if ( CKEDITOR.env.gecko )
+                {
+                        activateEditing( editor );
 
+                        // Ensure bogus br could help to move cursor (out of styles) to the end of block. (#7041)
+                        var pathBlock = path.block || path.blockLimit;
+                        if ( pathBlock && !pathBlock.getBogus() )
+                                pathBlock.appendBogus();
+                }
+
                 // When enterMode set to block, we'll establing new paragraph only if we're
                 // selecting inline contents right under body. (#3657)
                 if ( enterMode != CKEDITOR.ENTER_BR

_source/core/dom/range.js

@@ -1068 +1068 @@
                                                                 if ( commonReached )
                                                                         endTop = enlargeable;
                                                                 else if ( enlargeable )
-                                                                        this.setEndAfter( enlargeable );
-                                                        }
+                                                                {
+                                                                        var bogus = enlargeable.isBlockBoundary() && enlargeable.getBogus();
+
+                                                                        // Exclude bogus <br /> at the end of block.
+                                                                        if ( bogus )
+                                                                                this.setEndBefore( bogus );
+                                                                        else
+                                                                                this.setEndAfter( enlargeable );
+                                                                }
+                                                        }
 
                                                         sibling = enlargeable.getNext();
                                                 }