Ticket #6253: 6253_4.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

!TEST/UNIT-TESTS/tt/1659/1.html

@@ -47 +47 @@
 </pre>
 <textarea id="editor2" name="editor2" rows="10" cols="80"><p>text<br/>text<br/>text<br/>text<br/>text<br/>text<br/>text<br/>text<br/>text<br/>text<br/></p></textarea>
 <textarea id="editor3" name="editor3" rows="10" cols="80"><p>texttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttexttext</p></textarea>
+<link href="" rel="stylesheet">
 </body>
 </html>

_source/plugins/list/plugin.js

@@ -298 +298 @@
                 // Insert the list to the DOM tree.
                 var insertAnchor = listContents[ listContents.length - 1 ].getNext(),
                         listNode = doc.createElement( this.type ),
-                        dir;
+                        listDir, explicitDirection;
 
                 listsCreated.push( listNode );
+
+                var contentBlock, listItem;
+
+                // Loop over all items to figure out new list direction.
+                for ( i = 0; i < listContents.length; i++ )
+                {
+                        contentBlock = listContents[ i ];
+
+                        if ( !explicitDirection && contentBlock.getDirection() )
+                                explicitDirection = 1;
+
+                        var itemDir = contentBlock.getDirection( 1 ) || editor.config.contentsLangDirection;
+
+                        if ( listDir !== null )
+                        {
+                                if ( listDir && listDir != itemDir )
+                                        listDir = null;
+                                else
+                                        listDir = itemDir;
+                        }
+                }
+
                 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 );