Ticket #8087: 8087_2.patch

_source/core/dom/element.js

@@ -1595 +1595 @@
                  */
                 getDirection : function( useComputed )
                 {
-                        return useComputed ?
-                                this.getComputedStyle( 'direction' )
-                                        // Webkit: offline element returns empty direction (#8053).
-                                        || this.getDirection()
-                                        || this.getDocument().$.dir
-                                        || this.getDocument().getBody().getDirection( 1 )
-                                : this.getStyle( 'direction' ) || this.getAttribute( 'dir' );
+                        if ( useComputed )
+                        {
+                                var dir = this.getComputedStyle( 'direction' ) || this.getDirection();
+
+                                // Webkit: offline element won't inherit direction from parents (#8053).
+                                if ( !dir )
+                                {
+                                        var parents = this.getParents( 1 );
+                                        for ( var i = 0, count = parents.length; i < count; i++ )
+                                        {
+                                                if ( dir = parents[ i ].getDirection() )
+                                                        return dir;
+                                        }
+                                }
+
+                                return dir;
+                        }
+                        else
+                                return this.getStyle( 'direction' ) || this.getAttribute( 'dir' );
                 },
 
                 /**

_source/plugins/list/plugin.js

@@ -107 +107 @@
 
                                         if ( orgDir != rootNode.getDirection( 1 ) )
                                                 currentListItem.setAttribute( 'dir', orgDir );
-                                        else
-                                                currentListItem.removeAttribute( 'dir' );
 
                                         for ( var i = 0 ; i < item.contents.length ; i++ )
                                                 currentListItem.append( item.contents[i].clone( 1, 1 ) );
@@ -155 +153 @@
                                         {
                                                 if ( item.grandparent.getDirection( 1 ) != orgDir )
                                                         currentListItem.setAttribute( 'dir', orgDir );
-                                                else
-                                                        currentListItem.removeAttribute( 'dir' );
                                         }
 
                                         for ( i = 0 ; i < item.contents.length ; i++ )
@@ -208 +204 @@
                                         break;
                         }
 
-                        // Clear marker attributes for the new list tree made of cloned nodes, if any.
                         if ( database )
                         {
-                                var currentNode = retval.getFirst();
+                                var currentNode = retval.getFirst(),
+                                        itemDir,
+                                        listRoot = listArray[ 0 ].parent;
+
                                 while ( currentNode )
                                 {
                                         if ( currentNode.type == CKEDITOR.NODE_ELEMENT )
+                                        {
+                                                // Clear marker attributes for the new list tree made of cloned nodes, if any.
                                                 CKEDITOR.dom.element.clearMarkers( database, currentNode );
+
+                                                // Clear redundant direction attribute.
+                                                if ( currentNode.is( 'li' ) && ( itemDir = currentNode.getDirection() ) )
+                                                {
+                                                        var listNode = currentNode.getParent();
+                                                        if ( itemDir == ( listNode && listNode.getDirection( 1 ) || listRoot.getDirection( 1 ) ) )
+                                                                currentNode.removeAttribute( 'dir' );
+                                                }
+                                        }
+
                                         currentNode = currentNode.getNextSourceNode();
                                 }
                         }