Ticket #3684: 3684_4.patch

_source/plugins/wysiwygarea/plugin.js

@@ -154 +154 @@
                         }
 
                         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( nonExitableElementNames ) )
+                                enterBlock = previousElement;
+                        else if ( !nextElement.is ( nonExitableElementNames ) )
+                                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.