Ticket #3657: 3657_2.patch

_source/plugins/wysiwygarea/plugin.js

@@ -116 +117 @@
                 var editor = evt.editor,
                         path = evt.data.path,
                         blockLimit = path.blockLimit,
+                        pathLastElement = path.lastElement, 
                         body = editor.document.getBody(),
                         enterMode = editor.config.enterMode;
 
@@ -123 +125 @@
                 // current range is block-less within body.
                 if ( enterMode != CKEDITOR.ENTER_BR
                          && blockLimit.getName() == 'body'
-                         && !path.block )
+                         && !path.block
+                         && !( pathLastElement.isBlockLike  && pathLastElement.isBlockLike() ) )
                 {
                         var selection = evt.data.selection,
                                 range = evt.data.selection.getRanges()[0],

_source/core/dom/domwalker.js

@@ -201 +201 @@
         },
                 blockBoundaryNodeNameMatch = { hr : 1 };
 
-        CKEDITOR.dom.element.prototype.isBlockBoundary = function( customNodeNames )
+        CKEDITOR.dom.element.prototype.isBlockLike = function( customNodeNames )
         {
                 var nodeNameMatches = CKEDITOR.tools.extend( {}, blockBoundaryNodeNameMatch, customNodeNames || {} );
 
@@ -217 +217 @@
                                 from = evt.data.from;
                         if ( to && to.type == CKEDITOR.NODE_ELEMENT )
                         {
-                                if ( to.isBlockBoundary( customNodeNames ) )
+                                if ( to.isBlockLike( customNodeNames ) )
                                 {
                                         evt.stop();
                                         this.stop();
@@ -226 +226 @@
                         }
                         if ( ( evt.data.type == 'up' || evt.data.type == 'sibling' ) && from && from.type == CKEDITOR.NODE_ELEMENT )
                         {
-                                if ( from.isBlockBoundary( customNodeNames ) )
+                                if ( from.isBlockLike( customNodeNames ) )
                                 {
                                         evt.stop();
                                         this.stop();