Ticket #3618: 3618_3.patch

_source/plugins/list/plugin.js

@@ -476 +476 @@
                         for ( i = 0 ; i < listsCreated.length ; i++ )
                         {
                                 listNode = listsCreated[i];
-                                var stopFlag = false,
-                                        currentNode = listNode;
+                                var mergeSibling, listCommand = this;
+                                ( mergeSibling = function( rtl ){
 
-                                while ( !stopFlag )
-                                {
-                                        currentNode = currentNode.getNext();
-                                        if ( currentNode && currentNode.type == CKEDITOR.NODE_TEXT && emptyTextRegex.test( currentNode.getText() ) )
-                                                continue;
-                                        stopFlag = true;
-                                }
+                                        var sibling = listNode[ rtl ? 'getPrevious' : 'getNext' ].call( listNode, true );
+                                        if ( sibling && sibling.getName &&
+                                             sibling.getName() == listCommand.type )
+                                        {
+                                                sibling.remove();
+                                                sibling.moveChildren( listNode );
+                                        }
+                                } )();
 
-                                if ( currentNode && currentNode.getName() == this.type )
-                                {
-                                        currentNode.remove();
-                                        currentNode.moveChildren( listNode );
-                                }
+                                mergeSibling( true );
+                        }
 
-                                stopFlag = false;
-                                currentNode = listNode;
-                                while ( !stopFlag )
-                                {
-                                        currentNode = currentNode.getNext();
-                                        if ( currentNode && currentNode.type == CKEDITOR.NODE_TEXT && emptyTextRegex.test( currentNode.getText() ) )
-                                                continue;
-                                        stopFlag = true;
-                                }
-                                if ( currentNode && currentNode.getName() == this.type  )
-                                {
-                                        currentNode.remove();
-                                        currentNode.moveChildren( listNode, true );
-                                }
-                        }
-
                         // Clean up, restore selection and update toolbar button states.
                         CKEDITOR.dom.element.clearAllMarkers( database );
                         selection.selectBookmarks( bookmarks );