Ticket #3684: 3684_3.patch

_source/plugins/wysiwygarea/plugin.js

@@ -130 +130 @@
                         selection = evt.data.selection,
                         range = selection.getRanges()[0],
                         body = editor.document.getBody(),
-                        enterMode = editor.config.enterMode;
+                        enterMode = editor.config.enterMode,
+                        enterBlockName = enterMode == CKEDITOR.ENTER_P ? 'p' : 'div';
 
                 // When enterMode set to block, we'll establing new paragraph only if we're
                 // selecting inline contents right under body. (#3657)
@@ -154 +155 @@
                         }
 
                         selection.selectBookmarks( bms );
-                }
+
+                        // If the fixed block is blank and is already followed by a enter block,
+                        // we should drop it and move to the next block(#3684).
+                        var children = fixedBlock.getChildren(),
+                                count = children.count(),
+                                firstChild,
+                                previousElement = fixedBlock.getPrevious( true ),
+                                nextElement = fixedBlock.getNext( true ),
+                                enterBlock;
+                        if ( previousElement.is( enterBlockName ) )
+                                enterBlock = previousElement;
+                        else if ( nextElement.is ( enterBlockName ) )
+                                enterBlock = nextElement;
+
+                        if( ( !count
+                                  || ( firstChild = children.getItem( 0 ) ) && firstChild.is && firstChild.is( 'br' ) )
+                                && enterBlock )
+                        {
+                                fixedBlock.remove();
+                                range.moveToElementEditStart( enterBlock );
+                                range.select();
+                        }
+                }
 
                 // Inserting the padding-br before body if it's preceded by an
                 // unexitable block.