Ticket #6569: 6569.patch

_source/plugins/indent/plugin.js

@@ -78 +78 @@
         }
 
         // Returns the CSS property to be used for identing a given element.
-        function getIndentCssProperty( element )
+        function getIndentCssProperty( element, dir )
         {
-                return element.getComputedStyle( 'direction' ) == 'ltr' ? 'margin-left' : 'margin-right';
+                return ( dir || element.getComputedStyle( 'direction' ) ) == 'ltr' ? 'margin-left' : 'margin-right';
         }
 
         function isListItem( node )
@@ -157 +157 @@
 
                                 // Convert the array back to a DOM forest (yes we might have a few subtrees now).
                                 // And replace the old list with the new forest.
-                                var newListDir = listNode.getAttribute( 'dir' ) || listNode.getStyle( 'direction' );
-                                var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, newListDir );
+                                var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, listNode.getDirection() );
 
                                 // Avoid nested <li> after outdent even they're visually same,
                                 // recording them for later refactoring.(#3982)
@@ -220 +219 @@
                                         indentElement( block );
                         }
 
-                        function indentElement( element )
+                        function indentElement( element, dir )
                         {
                                 if ( element.getCustomData( 'indent_processed' ) )
                                         return false;
@@ -256 +255 @@
                                 }
                                 else
                                 {
-                                        var indentCssProperty = getIndentCssProperty( element ),
+                                        var indentCssProperty = getIndentCssProperty( element, dir ),
                                                 currentOffset = parseInt( element.getStyle( indentCssProperty ), 10 );
                                         if ( isNaN( currentOffset ) )
                                                 currentOffset = 0;
@@ -328 +327 @@
 
                                 if ( nearestListBlock )
                                 {
-                                        var firstListItem = nearestListBlock.getFirst( function( node )
-                                                {
-                                                        return node.type == CKEDITOR.NODE_ELEMENT && node.is( 'li' );
-                                                }),
+                                        var firstListItem = nearestListBlock.getFirst( isListItem ),
+                                                hasMultipleItems = !!firstListItem.getNext( isListItem ),
                                                 rangeStart = range.startContainer,
                                                 indentWholeList = firstListItem.equals( rangeStart ) || firstListItem.contains( rangeStart );
 
@@ -339 +336 @@
                                         // Only do that for indenting or when using indent classes or when there is something to outdent. (#6141)
                                         if ( !( indentWholeList &&
                                                 ( self.name == 'indent' || self.useIndentClasses || parseInt( nearestListBlock.getStyle( getIndentCssProperty( nearestListBlock ) ), 10 ) ) &&
-                                                        indentElement( nearestListBlock ) ) )
+                                                        indentElement( nearestListBlock, !hasMultipleItems && firstListItem.getDirection() ) ) )
                                                                 indentList( nearestListBlock );
                                 }
                                 else