Ticket #5335: 5335.patch

_source/plugins/list/plugin.js

@@ -279 +279 @@
                 {
                         var contentBlock = listContents.shift(),
                                 listItem = doc.createElement( 'li' );
-                        contentBlock.moveChildren( listItem );
-                        contentBlock.remove();
+
+                        listItem = CKEDITOR.plugins.styles.replaceBlock( contentBlock, listItem, true );
                         listItem.appendTo( listNode );
 
                         // Append a bogus BR to force the LI to render at full height

_source/plugins/styles/plugin.js

@@ -8 +8 @@
         requires : [ 'selection' ]
 });
 
+CKEDITOR.plugins.styles = {};
+
 /**
  * Registers a function to be called whenever a style changes its state in the
  * editing area. The current state is passed to the function. The possible
@@ -791 +793 @@
                 while ( ( block = iterator.getNextParagraph() ) )               // Only one =
                 {
                         var newBlock = getElement( this, doc );
-                        replaceBlock( block, newBlock );
+                        CKEDITOR.plugins.styles.replaceBlock( block, newBlock );
                 }
 
                 range.moveToBookmark( bookmark );
@@ -800 +802 @@
         // Replace the original block with new one, with special treatment
         // for <pre> blocks to make sure content format is well preserved, and merging/splitting adjacent
         // when necessary.(#3188)
-        function replaceBlock( block, newBlock )
+        CKEDITOR.plugins.styles.replaceBlock = function( block, newBlock, dontReplace )
         {
                 var newBlockIsPre       = newBlock.is( 'pre' );
                 var blockIsPre          = block.is( 'pre' );
@@ -816 +818 @@
                 else
                         block.moveChildren( newBlock );
 
-                newBlock.replace( block );
+                dontReplace ? block.remove() : newBlock.replace( block );
 
                 if ( newBlockIsPre )
                 {
                         // Merge previous <pre> blocks.
                         mergePre( newBlock );
                 }
+
+                if ( dontReplace )
+                        return newBlock;
         }
 
         /**