Ticket #6253: 6253_3.patch

_source/core/dom/element.js

@@ -1552 +1552 @@
                                                 this.setStyle( type, size + 'px' );
                                         }
                                 };
-                })()
+                })(),
+
+                /**
+                 * Checks for element's direction. Supports both CSS 'direction' prop and 'dir' attr.
+                 */
+                hasDirection : function()
+                {
+                        return !!( this.hasAttribute( 'dir' ) || this.getStyle( 'direction' ) );
+                },
+
+                /**
+                 * Gets element's direction. Supports both CSS 'direction' prop and 'dir' attr.
+                 */
+                getDirection : function()
+                {
+                        return this.hasDirection() && this.getAttribute( 'dir' ) || this.getStyle( 'direction' );
+                },
+
+                /**
+                 * Removes element's direction. Supports both CSS 'direction' prop and 'dir' attr.
+                 *
+                 * @param direcitonFlag CKEDITOR.DIRECTION_ATTR or CKEDITOR.DIRECTION_CSS
+                 *    Defaults to both.
+                 */
+                removeDirection : function( direcitonFlag )
+                {
+                        if ( direcitonFlag === undefined )
+                                direcitonFlag = CKEDITOR.DIRECTION_ATTR | CKEDITOR.DIRECTION_CSS;
+
+                        if ( direcitonFlag & CKEDITOR.DIRECTION_ATTR )
+                                this.hasAttribute( 'dir ') && this.removeAttribute( 'dir ');
+
+                        if ( direcitonFlag & CKEDITOR.DIRECTION_CSS )
+                                this.removeStyle( 'direction' );
+                }
         });
+
+CKEDITOR.DIRECTION_ATTR = 1;
+CKEDITOR.DIRECTION_CSS = 2;
+ No newline at end of file

_source/plugins/list/plugin.js

@@ -291 +291 @@
                 // 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.hasDirection() )
+                                explicitDirection = 1;
+
+                        var itemDir = contentBlock.getDirection() || 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' ) )
-                                {
-                                        dir = dir || contentBlock.getAttribute( 'dir' );
-                                        contentBlock.removeAttribute( 'dir' );
-                                }
+                                // Remove DIR attribute if it was merged into list root.
+                                if ( listDir && contentBlock.hasDirection() )
+                                        contentBlock.removeDirection();
+                                
                                 contentBlock.copyAttributes( listItem );
                                 contentBlock.moveChildren( listItem );
                                 contentBlock.remove();
@@ -321 +342 @@
                         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 );