Ticket #4139: 4139_2.patch

_source/plugins/list/plugin.js

@@ -342 +342 @@
 
                 var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode );
 
-                // Compensate a <br> before the first node if the previous node of list is a non-blocks.(#3836)
-                var docFragment = newList.listNode, firstNode, previousNode;
-                if ( ( firstNode = docFragment.getFirst() )
-                         && !( firstNode.is && firstNode.isBlockBoundary() )
-                         && ( previousNode = groupObj.root.getPrevious( true ) )
-                         && !( previousNode.is && previousNode.isBlockBoundary( { br : 1 } ) ) )
-                        editor.document.createElement( 'br' ).insertBefore( firstNode );
+                // Compensate <br> before/after the list node if the surrounds are non-blocks.(#3836)
+                var docFragment = newList.listNode, boundaryNode, siblingNode;
+                function compensateBrs( isStart )
+                {
+                        if ( ( boundaryNode = docFragment[ isStart ? 'getFirst' : 'getLast' ]() )
+                                 && !( boundaryNode.is && boundaryNode.isBlockBoundary() )
+                                 && ( siblingNode = groupObj.root[ isStart ? 'getPrevious' : 'getNext' ]
+                                      ( CKEDITOR.dom.walker.whitespaces( true ) ) )
+                                 && !( siblingNode.is && siblingNode.isBlockBoundary( { br : 1 } ) ) )
+                                editor.document.createElement( 'br' )[ isStart ? 'insertBefore' : 'insertAfter' ]( boundaryNode );
+                }
+                compensateBrs( true );
+                compensateBrs();
 
                 var rootParent = groupObj.root.getParent();
                 docFragment.replace( groupObj.root );
-                // The list content might be empty.(#3782)
-                if( !CKEDITOR.env.ie && rootParent )
-                        rootParent.appendBogus();
         }
 
         function listCommand( name, type )

CHANGES.html

@@ -210 +210 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4123">#4123</a> : Some dialog buttons were broken in IE7 quirks.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4122">#4122</a> : [IE] The image dialog
                         was being rendered improperly when loading an image with long URL.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4139">#4139</a> : Fixed list plugin logics which broken TC of plugin/list/test_ticket_3836.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>