Ticket #6485: 6484_2.patch

_source/plugins/bidi/plugin.js

@@ -186 +186 @@
                                 // Creates bookmarks for selection, as we may split some blocks.
                                 var bookmarks = selection.createBookmarks();
 
-                                var iterator,
-                                        block;
+                                var rangeIterator = ranges.createIterator(),
+                                        range,
+                                        i = 0;
+
+                                while ( ( range = rangeIterator.getNextRange() ) )
+                                {
+                                        var iterator,
+                                                block;
 
-                                for ( var i = ranges.length - 1 ; i >= 0 ; i-- )
-                                {
                                         // Array of elements processed as guardElements.
                                         var processedElements = [];
                                         // Walker searching for guardElements.
-                                        var walker = new CKEDITOR.dom.walker( ranges[ i ] );
+                                        var walker = new CKEDITOR.dom.walker( range );
+
+                                        var start = bookmarks[ i ].startNode,
+                                                end = bookmarks[ i++ ].endNode;
+
                                         walker.evaluator = function( node )
                                         {
-                                                return node.type == CKEDITOR.NODE_ELEMENT
-                                                        && node.getName() in guardElements
-                                                        && !( node.getName() == ( enterMode == CKEDITOR.ENTER_P ) ? 'p' : 'div'
-                                                                && node.getParent().type == CKEDITOR.NODE_ELEMENT
-                                                                && node.getParent().getName() == 'blockquote'
-                                                        );
+                                                return !! ( node.type == CKEDITOR.NODE_ELEMENT
+                                                                && node.getName() in guardElements
+                                                                && !( node.getName() == ( enterMode == CKEDITOR.ENTER_P ) ? 'p' : 'div'
+                                                                        && node.getParent().type == CKEDITOR.NODE_ELEMENT
+                                                                        && node.getParent().getName() == 'blockquote' )
+                                                                // Element must be fully included in the range as well. (#6485).
+                                                                && node.getPosition( start ) & CKEDITOR.POSITION_FOLLOWING
+                                                                && ( ( node.getPosition( end ) & CKEDITOR.POSITION_PRECEDING + CKEDITOR.POSITION_CONTAINS ) == CKEDITOR.POSITION_PRECEDING ) );
                                         };
 
                                         while ( ( block = walker.next() ) )
                                                 switchDir( block, dir, editor, database );
 
-                                        iterator = ranges[ i ].createIterator();
+                                        iterator = range.createIterator();
                                         iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;
 
                                         while ( ( block = iterator.getNextParagraph( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ) )
                                                 !block.isReadOnly() && switchDir( block, dir, editor, database );
+                                }
 
-                                        CKEDITOR.dom.element.clearAllMarkers( database );
+                                CKEDITOR.dom.element.clearAllMarkers( database );
 
-                                        editor.forceNextSelectionCheck();
-                                        // Restore selection position.
-                                        selection.selectBookmarks( bookmarks );
-                                }
+                                editor.forceNextSelectionCheck();
+                                // Restore selection position.
+                                selection.selectBookmarks( bookmarks );
 
                                 editor.focus();
                         }