Ticket #6141: 6141_3.patch

_source/plugins/indent/plugin.js

@@ -256 +256 @@
                                 }
                                 else
                                 {
-                                        var indentCssProperty = getIndentCssProperty( element );
-                                        var currentOffset = parseInt( element.getStyle( indentCssProperty ), 10 );
+                                        var indentCssProperty = getIndentCssProperty( element ),
+                                                currentOffset = parseInt( element.getStyle( indentCssProperty ), 10 );
+                                        // For lists, when indentOffset == 0 we must use 1 instead of zero here so it'll be possible to indent it. (#6141)
                                         if ( isNaN( currentOffset ) )
                                                 currentOffset = 0;
                                         currentOffset += ( self.name == 'indent' ? 1 : -1 ) * editor.config.indentOffset;
@@ -283 +284 @@
 
                         var skipBookmarks = function( node )
                         {
-                                return ! node.hasAttribute( '_cke_bookmark' );
+                                return !node.hasAttribute( '_cke_bookmark' );
                         };
 
                         var iterator = ranges.createIterator();
@@ -321 +322 @@
                                         range.endContainer = walker.previous();
                                 }
 
-                                if ( nearestListBlock  )
+                                if ( nearestListBlock )
                                 {
                                         var firstListItem = nearestListBlock.getFirst( function( node )
                                                 {
@@ -330 +331 @@
                                                 rangeStart = range.startContainer,
                                                 indentWholeList = firstListItem.equals( rangeStart ) || firstListItem.contains( rangeStart );
 
-                                        // Indent the entire list if  cursor is inside the first list item. (#3893)
-                                        if ( !( indentWholeList && indentElement( nearestListBlock ) ) )
-                                                indentList( nearestListBlock );
+                                        // Indent the entire list if cursor is inside the first list item. (#3893)
+                                        // Only do that for indenting or when there is something to outdent. (#6141)
+                                        if ( !( indentWholeList &&
+                                                ( self.name == 'indent' || parseInt( nearestListBlock.getStyle( getIndentCssProperty( nearestListBlock ) ), 10 ) ) &&
+                                                indentElement( nearestListBlock ) ) )
+                                                        indentList( nearestListBlock );
                                 }
                                 else
                                         indentBlock();