Ticket #6253: 6253_5.patch

_source/core/dom/element.js

@@ -1552 +1552 @@
                                                 this.setStyle( type, size + 'px' );
                                         }
                                 };
-                })()
-        });
+                })(),
+
+                /**
+                 * Gets element's direction. Supports both CSS 'direction' prop and 'dir' attr.
+                 */
+                getDirection : function( includeComputedDirection )
+                {
+                        return this.getAttribute( 'dir' ) || this.getStyle( 'direction' ) || ( includeComputedDirection && this.getComputedStyle( 'direction' ) );
+                }
+        });
+ No newline at end of file

_source/plugins/list/plugin.js

@@ -275 +275 @@
                 for ( var i = 0 ; i < contents.length ; i++ )
                         commonParent = commonParent.getCommonAncestor( contents[i].getParent() );
 
+                var useComputedState = editor.config.useComputedState,
+                        listDir, explicitDirection;
+
+                useComputedState = useComputedState === undefined || useComputedState;
+
                 // We want to insert things that are in the same tree level only, so calculate the contents again
                 // by expanding the selected blocks to the same tree level.
                 for ( i = 0 ; i < contents.length ; i++ )
@@ -286 +291 @@
                                 if ( parentNode.equals( commonParent ) )
                                 {
                                         listContents.push( contentNode );
+
+                                        // Determine the lists's direction. 
+                                        if ( !explicitDirection && contentNode.getDirection() )
+                                                explicitDirection = 1;
+
+                                        var itemDir = contentNode.getDirection( useComputedState ) || editor.config.contentsLangDirection;
+
+                                        if ( listDir !== null )
+                                        {
+                                                if ( listDir && listDir != itemDir )
+                                                        listDir = null;
+                                                else
+                                                        listDir = itemDir;
+                                        }
+
                                         break;
                                 }
                                 contentNode = parentNode;
@@ -297 +317 @@
 
                 // Insert the list to the DOM tree.
                 var insertAnchor = listContents[ listContents.length - 1 ].getNext(),
-                        listNode = doc.createElement( this.type ),
-                        dir;
+                        listNode = doc.createElement( this.type );
 
                 listsCreated.push( listNode );
+
+                var contentBlock, listItem;
+
                 while ( listContents.length )
                 {
-                        var contentBlock = listContents.shift(),
-                                listItem = doc.createElement( 'li' );
+                        contentBlock = listContents.shift();
+                        listItem = doc.createElement( 'li' );
 
                         // Preserve preformat block and heading structure when converting to list item. (#5335) (#5271)
                         if ( contentBlock.is( 'pre' ) || headerTagRegex.test( contentBlock.getName() ) )
                                 contentBlock.appendTo( listItem );
                         else
                         {
-                                if ( contentBlock.hasAttribute( 'dir' ) )
+                                // Remove DIR attribute if it was merged into list root.
+                                if ( listDir && contentBlock.getDirection() )
                                 {
-                                        dir = dir || contentBlock.getAttribute( 'dir' );
+                                        contentBlock.removeStyle( 'direction' );
                                         contentBlock.removeAttribute( 'dir' );
                                 }
+                                
                                 contentBlock.copyAttributes( listItem );
                                 contentBlock.moveChildren( listItem );
                                 contentBlock.remove();
@@ -324 +348 @@
                         listItem.appendTo( listNode );
                 }
 
-                if ( dir )
-                        listNode.setAttribute( 'dir', dir );
+                // Apply list root dir only if it has been explicitly declared.
+                if ( listDir && explicitDirection )
+                        listNode.setAttribute( 'dir', listDir );
 
                 if ( insertAnchor )
                         listNode.insertBefore( insertAnchor );