Ticket #3684: 3684.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)
@@ -139 +140 @@
                          && blockLimit.getName() == 'body'
                          && !path.block )
                 {
-                        var bms = selection.createBookmarks(),
-                                fixedBlock = range.fixBlock( true,
-                                        editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p'  );
+                        // If we're collapsed between two blocks, check if there's a
+                        // enter block already.
+                        var nodeBefore = range.startContainer.getChild( range.startOffset - 1 ),
+                                nodeAfter = range.endContainer.getChild( range.endOffset ),
+                                enterBlock;
+                        if( nodeBefore && nodeBefore.is && nodeBefore.is( enterBlockName ) )
+                                enterBlock = nodeBefore;
+                        else if ( nodeAfter && nodeAfter.is && nodeAfter.is( enterBlockName ) )
+                                enterBlock = nodeAfter;
+
+                        // 1. If we've already had an enter block, move to the first editing position.
+                        // 2. Otherwise, wrapping with a new enter block.
+                        if ( enterBlock )
+                        {
+                                range.moveToElementEditStart( enterBlock );
+                                range.select();
+                        }
+                        else
+                        {
+                                var bms = selection.createBookmarks(),
+                                        fixedBlock = range.fixBlock( true,
+                                                editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p'  );
 
-                        // For IE, we'll be removing any bogus br ( introduce by fixing body )
-                        // right now to prevent it introducing visual line break.
-                        if ( CKEDITOR.env.ie )
-                        {
-                                var brNodeList = fixedBlock.getElementsByTag( 'br' ), brNode;
-                                for ( var i = 0 ; i < brNodeList.count() ; i++ )
-                                        if( ( brNode = brNodeList.getItem( i ) ) && brNode.hasAttribute( '_cke_bogus' ) )
-                                                brNode.remove();
-                        }
+                                // For IE, we'll be removing any bogus br ( introduce by fixing body )
+                                // right now to prevent it introducing visual line break.
+                                if ( CKEDITOR.env.ie )
+                                {
+                                        var brNodeList = fixedBlock.getElementsByTag( 'br' ), brNode;
+                                        for ( var i = 0 ; i < brNodeList.count() ; i++ )
+                                                if( ( brNode = brNodeList.getItem( i ) ) && brNode.hasAttribute( '_cke_bogus' ) )
+                                                        brNode.remove();
+                                }
 
-                        selection.selectBookmarks( bms );
-                }
+                                selection.selectBookmarks( bms );
+                        }
+                }
 
                 // Inserting the padding-br before body if it's preceded by an
                 // unexitable block.