Ticket #3509: 3509.patch

K:/Source/ckeditor/_source/plugins/styles/plugin.js

@@ -283 +283 @@
         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;
                 }