Ticket #5767: 5767.patch

_source/core/dom/element.js

@@ -234 +234 @@
                                 this.append( new CKEDITOR.dom.text( text ) );
                 },
 
-                appendBogus : function()
-                {
-                        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 || !lastChild.is || !lastChild.is( 'br' ) )
-                        {
-                                var bogus = CKEDITOR.env.opera ?
-                                                this.getDocument().createText('') :
-                                                this.getDocument().createElement( 'br' );
-
-                                CKEDITOR.env.gecko && bogus.setAttribute( 'type', '_moz' );
-
-                                this.append( bogus );
-                        }
-                },
-
                 /**
                  * Breaks one of the ancestor element in the element position, moving
                  * this element between the broken parts.

_source/core/dom/walker.js

@@ -448 +448 @@
                 return false;
         };
 
+        var whitespaces = CKEDITOR.dom.walker.whitespaces(),
+                bookmarks = CKEDITOR.dom.walker.bookmark( false );
+
+        CKEDITOR.dom.element.prototype.appendBogus = function ()
+        {
+                var range = new CKEDITOR.dom.range( this.document );
+                range.selectNodeContents( this );
+                var walker = new CKEDITOR.dom.walker( range );
+
+                walker.evaluator = function( node )
+                {
+                        if ( whitespaces( node )
+                                        || bookmarks( node )
+                                        || node.type == CKEDITOR.NODE_ELEMENT
+                                        && node.getName() in CKEDITOR.dtd.$inline
+                                        && !( node.getName() in CKEDITOR.dtd.$empty ) )
+                        {
+                                return false;
+                        }
+                };
+
+                if ( !walker.previous() )
+                {
+                        var bogus = CKEDITOR.env.opera ?
+                                        this.getDocument().createText('') :
+                                        this.getDocument().createElement( 'br' );
+
+                        CKEDITOR.env.gecko && bogus.setAttribute( 'type', '_moz' );
+
+                        this.append( bogus );
+                }
+        };
+
 })();