Ticket #6479: 6479_2.patch

_source/plugins/enterkey/plugin.js

@@ -115 +115 @@
                                         newBlock = nextBlock.clone();
 
                                 if ( !newBlock )
+                                {
                                         newBlock = doc.createElement( blockTag );
+                                        previousBlock && previousBlock.hasAttribute( 'dir' ) && newBlock.setAttribute( 'dir', previousBlock.getAttribute( 'dir' ) );
+                                }
                                 // Force the enter block unless we're talking of a list item.
                                 else if ( forceMode && !newBlock.is( 'li' ) )
                                         newBlock.renameNode( blockTag );
@@ -222 +225 @@
                         // If we are at the end of a header block.
                         if ( !forceMode && isEndOfBlock && headerTagRegex.test( startBlockTag ) )
                         {
-                                // Insert a <br> after the current paragraph.
-                                doc.createElement( 'br' ).insertAfter( startBlock );
+                                var newBlock;
+                                if ( startBlock.hasAttribute( 'dir' ) )
+                                {
+                                        newBlock = doc.createElement( 'div' );
+                                        newBlock.setAttribute( 'dir', startBlock.getAttribute( 'dir' ) );
+                                        newBlock.insertAfter( startBlock );
+                                        range.setStart( newBlock, 0 );
+                                }
+                                else
+                                {
+                                        // Insert a <br> after the current paragraph.
+                                        doc.createElement( 'br' ).insertAfter( startBlock );
 
-                                // A text node is required by Gecko only to make the cursor blink.
-                                if ( CKEDITOR.env.gecko )
-                                        doc.createText( '' ).insertAfter( startBlock );
+                                        // A text node is required by Gecko only to make the cursor blink.
+                                        if ( CKEDITOR.env.gecko )
+                                                doc.createText( '' ).insertAfter( startBlock );
 
-                                // IE has different behaviors regarding position.
-                                range.setStartAt( startBlock.getNext(), CKEDITOR.env.ie ? CKEDITOR.POSITION_BEFORE_START : CKEDITOR.POSITION_AFTER_START );
+                                        // IE has different behaviors regarding position.
+                                        range.setStartAt( startBlock.getNext(), CKEDITOR.env.ie ? CKEDITOR.POSITION_BEFORE_START : CKEDITOR.POSITION_AFTER_START );
+                                }
                         }
                         else
                         {