Ticket #3509: 3509_4.patch_

Index: _source/plugins/styles/plugin.js
===================================================================
--- _source/plugins/styles/plugin.js    (revision 3495)
+++ _source/plugins/styles/plugin.js    (working copy)
@@ -283,17 +283,33 @@
        function applyInlineStyle( range )
        {
                var document = range.document;
+               
+               var wasCollapsed = range.collapsed;
 
-               if ( range.collapsed )
+               // Get next element after range. If it's a Gecko-appended BR,
+               // we want to include it in the range, so that the style will
+               // be maintained in new text added at the end of the line.
+               var nextElement = range.endContainer.getNextSourceNode( false, CKEDITOR.NODE_ELEMENT );
+               if ( CKEDITOR.env.gecko && nextElement && nextElement.is( 'br' ))
                {
+                       if (range.endContainer.type != CKEDITOR.NODE_TEXT || range.endOffset === range.endContainer.getLength() )
+                               range.setEndAfter(nextElement);
+               }
+
+               if ( wasCollapsed )
+               {
                        // Create the element to be inserted in the DOM.
                        var collapsedElement = getElement( this, document );
+                       
+                       // Even though the range was collapsed, it may now contain a single BR.
+                       var contents = range.extractContents();
 
                        // Insert the empty element into the DOM at the range position.
                        range.insertNode( collapsedElement );
+                       contents.appendTo( collapsedElement );
 
                        // Place the selection right inside the empty element.
-                       range.moveToPosition( collapsedElement, CKEDITOR.POSITION_BEFORE_END );
+                       range.moveToPosition( collapsedElement, CKEDITOR.POSITION_AFTER_START );
 
                        return;
                }
Index: _source/plugins/enterkey/plugin.js
===================================================================
--- _source/plugins/enterkey/plugin.js  (revision 3502)
+++ _source/plugins/enterkey/plugin.js  (working copy)
@@ -139,6 +139,11 @@
                        if ( !newBlock )
                                newBlock = doc.createElement( blockTag );
 
+                       // We need to insert the bogus element inside all of the inline
+                       // style elements, so that clicking after the line or pressing end
+                       // and typing makes the typed text keep these inline styles.
+                       var blockWithBogus = newBlock;
+
                        // Recreate the inline elements tree, which was available
                        // before hitting enter, so the same styles will be available in
                        // the new block.
@@ -157,12 +162,14 @@
                                                element = element.clone();
                                                newBlock.moveChildren( element );
                                                newBlock.append( element );
+
+                                               blockWithBogus = element;
                                        }
                                }
                        }
 
                        if ( !CKEDITOR.env.ie )
-                               newBlock.appendBogus();
+                               blockWithBogus.appendBogus();
 
                        range.insertNode( newBlock );
 
Index: _source/core/dom/element.js
===================================================================
--- _source/core/dom/element.js (revision 3502)
+++ _source/core/dom/element.js (working copy)
@@ -243,10 +243,11 @@
                                lastChild = lastChild.getPrevious();
                        if ( !lastChild || !lastChild.is || !lastChild.is( 'br' ) )
                        {
-                               this.append(
-                                       CKEDITOR.env.opera ?
-                                               this.getDocument().createText('') :
-                                               this.getDocument().createElement( 'br' ) );
+                               var bogusElement = CKEDITOR.env.opera ?
+                                               this.getDocument().createText( '' ) :
+                                               this.getDocument().createElement( 'br' );
+                               this.append( bogusElement );
+                               return bogusElement;
                        }
                },
 
Index: _source/core/dom/range.js
===================================================================
--- _source/core/dom/range.js   (revision 3509)
+++ _source/core/dom/range.js   (working copy)
@@ -1299,6 +1299,17 @@
 
                        this.collapse( isStart );
 
+                       // If endContainer is at the end of the document, we need to create
+                       // a bogus element so that the range can include the entire endContainer.
+                       // (This isn't necessary otherwise, but doesn't hurt.)
+                       var tempBogus = null;
+                       if ( !CKEDITOR.env.ie )
+                       {
+                               var endPath = new CKEDITOR.dom.elementPath( this.endContainer );
+                               tempBogus = endPath.blockLimit.appendBogus();
+                               
+                       }
+
                        this.enlarge( CKEDITOR.ENLARGE_BLOCK_CONTENTS );
 
                        this.extractContents().appendTo( fixedBlock );
@@ -1307,6 +1318,9 @@
                        if ( !CKEDITOR.env.ie )
                                fixedBlock.appendBogus();
 
+                       if ( tempBogus )
+                               tempBogus.remove();
+
                        this.insertNode( fixedBlock );
 
                        this.moveToBookmark( bookmark );