Ticket #9080: 9080.patch

_source/plugins/list/plugin.js

@@ -681 +681 @@
 
                         // For all new lists created, merge into adjacent, same type lists.
                         for ( i = 0 ; i < listsCreated.length ; i++ )
-                        {
-                                listNode = listsCreated[i];
-                                var mergeSibling, listCommand = this;
-                                ( mergeSibling = function( rtl )
-                                {
-                                        var sibling = listNode[ rtl ? 'getPrevious' : 'getNext' ]( nonEmpty );
-                                        if ( sibling && sibling.getName &&
-                                                 sibling.getName() == listCommand.type )
-                                        {
-                                                // Move children order by merge direction.(#3820)
-                                                mergeChildren( listNode, sibling, null, !rtl );
+                                mergeListSiblings( listsCreated[ i ] );
+
+                        // Clean up, restore selection and update toolbar button states.
+                        CKEDITOR.dom.element.clearAllMarkers( database );
+                        selection.selectBookmarks( bookmarks );
+                        editor.focus();
+                }
+        };
+
+        // Merge list adjacent, of same type lists.
+        function mergeListSiblings( listNode )
+        {
+                var mergeSibling;
+                ( mergeSibling = function( rtl )
+                {
+                        var sibling = listNode[ rtl ? 'getPrevious' : 'getNext' ]( nonEmpty );
+                        if ( sibling && sibling.is( listNode.getName() ) )
+                        {
+                                // Move children order by merge direction.(#3820)
+                                mergeChildren( listNode, sibling, null, !rtl );
 
-                                                listNode.remove();
-                                                listNode = sibling;
-                                        }
-                                } )();
-                                mergeSibling( 1 );
-                        }
+                                listNode.remove();
+                                listNode = sibling;
+                        }
+                } )();
+                mergeSibling( 1 );
+        }
 
-                        // Clean up, restore selection and update toolbar button states.
-                        CKEDITOR.dom.element.clearAllMarkers( database );
-                        selection.selectBookmarks( bookmarks );
-                        editor.focus();
-                }
-        };
-
         var dtd = CKEDITOR.dtd;
         var tailNbspRegex = /[\t\r\n ]*(?:&nbsp;|\xa0)$/;
 
@@ -836 +838 @@
                         var nextBlock = nextPath.block,
                                 parentBlock = nextBlock.getParent();
 
+                        nextCursor.moveToPosition( nextBlock, CKEDITOR.POSITION_BEFORE_START );
                         nextBlock.remove();
 
                         // Remove if the path block container is now empty, e.g. li.
@@ -843 +846 @@
                                  !parentBlock.getFirst( nonEmpty ) &&
                                  !parentBlock.equals( nextPath.blockLimit ) )
                         {
+                                nextCursor.moveToPosition( parentBlock, CKEDITOR.POSITION_BEFORE_START );
                                 parentBlock.remove();
                         }
                 }
 
+                // Check if need to further merge with the list resides after the merged block. (#9080)
+                var walkerRng = nextCursor.clone(), body = editor.document.getBody();
+                walkerRng.setEndAt( body, CKEDITOR.POSITION_BEFORE_END );
+                var walker = new CKEDITOR.dom.walker( walkerRng );
+                walker.evaluator = function( node ) { return nonEmpty( node ) && !blockBogus( node ); };
+                var next = walker.next();
+                if ( next && next.type == CKEDITOR.NODE_ELEMENT && next.getName() in CKEDITOR.dtd.$list )
+                        mergeListSiblings( next );
+
                 // Make fresh selection.
                 cursor.select();
 
@@ -883 +896 @@
                         editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, numberedListCommand ) );
                         editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, bulletedListCommand ) );
 
-                        // [IE8] Fix "backspace" after list and "del" at the end of list item. (#8248)
-                        if ( CKEDITOR.env.ie8Compat )
-                        {
+                                // [IE8] Fix "backspace" after list and "del" at the end of list item. (#8248)
                                 editor.on( 'key', function( evt )
                                 {
                                         var key = evt.data.keyCode;
@@ -971 +982 @@
                                                 }
                                         }
                                 } );
-                        }
                 },
 
                 afterInit : function ( editor )