Ticket #3982: 3982.patch

_source/plugins/indent/plugin.js

@@ -144 +144 @@
                 // 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 newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, 0 );
+
+                // Avoid nested <li> after outdent even they're visually same,
+                // recording them for later refactoring.(#3982)
+                if ( this.name == 'outdent' )
+                {
+                        var parentLiElement;
+                        if ( ( parentLiElement = listNode.getParent() ) && parentLiElement.is( 'li' ) )
+                        {
+                                var children = newList.listNode.getChildren(),
+                                        pendingLis = [],
+                                        count = children.count(),
+                                        child;
+                                for ( var i = count - 1 ; i >= 0 ; i-- )
+                                        if( ( child = children.getItem( i ) ) && child.is && child.is( 'li' )  )
+                                                pendingLis.push( child );
+                        }
+                }
+
                 if ( newList )
                         newList.listNode.replace( listNode );
 
+                // Move the nested <li> to be appeared after the parent.
+                if ( pendingLis && pendingLis.length )
+                        for ( var i = 0; i < pendingLis.length ; i++ )
+                        {
+                                var li = pendingLis[ i ],
+                                        followingList = li;
+                                // Nest preceding <ul>/<ol> inside current <li> if any.
+                                while( ( followingList = followingList.getNext() ) &&
+                                           followingList.is &&
+                                           followingList.getName() in listNodeNames )
+                                        li.append( followingList );
+                                li.insertAfter( parentLiElement );
+                        }
+
                 // Clean up the markers.
                 CKEDITOR.dom.element.clearAllMarkers( database );
         }

CHANGES.html

@@ -152 +152 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3959">#3959</a> : Pasting styled text from word result in content lost.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3793">#3793</a> : Combined images into sprites.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3783">#3783</a> : Fixed indenting command in table cells create collapsed paragraph.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3982">#3982</a> : Fixed enterKey on empty list item result in weird dom structure.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>