Ticket #6610: 6610.patch

_source/plugins/bidi/plugin.js

@@ -140 +140 @@
                 return null;
         }
 
-        function getFullySelected( range, elements )
+        function getFullySelected( range, elements, enterMode )
         {
                 var ancestor = range.getCommonAncestor( false, true );
 
-                range.enlarge( CKEDITOR.ENLARGE_BLOCK_CONTENTS );
+                enterMode != 2 && range.enlarge( CKEDITOR.ENLARGE_BLOCK_CONTENTS );
 
                 if ( range.checkBoundaryOfElement( ancestor, CKEDITOR.START )
                                 && range.checkBoundaryOfElement( ancestor, CKEDITOR.END ) )
@@ -191 +191 @@
                                         if ( !selectedElement || selectedElement
                                                         && !( selectedElement.type == CKEDITOR.NODE_ELEMENT && selectedElement.getName() in directSelectionGuardElements )
                                                 )
-                                                selectedElement = getFullySelected( range, guardElements );
+                                                selectedElement = getFullySelected( range, guardElements, enterMode );
 
                                         if ( selectedElement && !selectedElement.isReadOnly() )
                                                 switchDir( selectedElement, dir, editor, database );
@@ -223 +223 @@
                                         iterator = range.createIterator();
                                         iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;
 
-                                        while ( ( block = iterator.getNextParagraph( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ) )
+                                        while ( ( block = iterator.getNextParagraph() ) )
                                                 !block.isReadOnly() && switchDir( block, dir, editor, database );
                                 }