Ticket #3046: 3046.patch

_source/plugins/list/plugin.js

@@ -121 +121 @@
                                                                 && currentListItem.getLast().type == CKEDITOR.NODE_ELEMENT
                                                                 && currentListItem.getLast().getAttribute( 'type' ) == '_moz' )
                                                         currentListItem.getLast().remove();
-                                                currentListItem.append( doc.createElement( 'br' ) );
+                                                currentListItem.appendBogusBr();
                                         }
 
                                         if ( currentListItem.getName() == paragraphMode && currentListItem.$.firstChild )
@@ -138 +138 @@
 
                                         var currentListItemName = currentListItem.$.nodeName.toLowerCase();
                                         if ( !CKEDITOR.env.ie && currentListItemName == 'div' || currentListItemName == 'p' )
-                                                currentListItem.append( doc.createElement( 'br' ) );
+                                                currentListItem.appendBogusBr();
                                         retval.append( currentListItem );
                                         rootNode = null;
                                         currentIndex++;

_source/core/dom/element.js

@@ -1207 +1207 @@
                                         this.removeClass( 'cke_disabled' );
                                         break;
                         }
+                },
+
+                appendBogusBr : function()
+                {
+                        var nodes = this.getElementsByTag( 'br' );
+
+                        // If there's any BR tag in the block tag, it means the block tag is already
+                        // visible, and thus there's no need to expand it.
+                        if ( nodes.count() > 0 )
+                                return;
+
+                        this.getDocument().createElement( 'br' ).appendTo( this );
                 }
         });