Ticket #3664: 3664.patch

_source/plugins/wysiwygarea/plugin.js

@@ -79 +79 @@
                                 // If we're inserting a block at dtd-violated positoin, split
                                 // the parent blocks until we reach blockLimit.
                                 var parent, dtd;
-                                if ( this.config.enterMode != CKEDITOR.ENTER_BR && isBlock )
+                                if ( isBlock )
                                         while( ( parent = range.getCommonAncestor( false, true ) )
                                                         && ( dtd = CKEDITOR.dtd[ parent.getName() ] )
                                                         && !( dtd && dtd [ elementName ] ) )
-                                                range.splitBlock();
+                                        {
+                                                // If we're in an 'blank' block, just replace it later
+                                                // by the new block.(#3664)
+                                                var children, count, firstChild;
+                                                if ( this.config.enterMode != CKEDITOR.ENTER_BR
+                                                          && parent.getName() in CKEDITOR.dtd.$block
+                                                          && ( children = parent.getChildren() )
+                                                          && ( ( count = children.count() ) || true )
+                                                          && ( !count ||
+                                                               count == 1
+                                                                   && ( firstChild = children.getItem( 0 ) )
+                                                                   && firstChild.is && firstChild.is( 'br' ) ) )
+                                                {
+                                                        range.setStartBefore( parent );
+                                                        range.collapse( true );
+                                                        parent.remove();
+                                                }
+                                                else
+                                                        range.splitBlock();
+                                        }
 
                                 // Insert the new node.
                                 range.insertNode( clone );

_source/plugins/domiterator/plugin.js

@@ -62 +62 @@
                                 {
                                                 this._.lastNode = range.document.createText( '' );
                                                 this._.lastNode.insertAfter( lastNode );
+                                                this._.lastNode.isDirty = true;
                                 }
                                 // Let's reuse this variable.
                                 range = null;
@@ -208 +209 @@
                                 if ( !range )
                                 {
                                         this._.nextNode = null;
+
+                                        // We've finished the iteration, remove the last node on dirty.
+                                        if ( this._.lastNode.isDirty )
+                                                this._.lastNode.remove();
+
                                         return null;
                                 }
 
@@ -304 +310 @@
                                 this._.nextNode = ( isLast || block.equals( lastNode ) ) ? null :
                                         block.getNextSourceNode( true, null, lastNode );
                         }
-
+                        
                         return block;
                 }
         };