Ticket #4543: 4543.patch

_source/plugins/wysiwygarea/plugin.js

@@ -187 +187 @@
                                 whitespaceGuard = CKEDITOR.dom.walker.whitespaces( true ),
                                 previousElement = fixedBlock.getPrevious( whitespaceGuard ),
                                 nextElement = fixedBlock.getNext( whitespaceGuard ),
-                                enterBlock;
+                                destBlock;
                         if ( previousElement && previousElement.getName
-                                 && !( previousElement.getName() in nonExitableElementNames ) )
-                                enterBlock = previousElement;
+                                 && !( previousElement.getName() in nonExitableElementNames )
+                                 && range.moveToElementEditStart( previousElement, true ) )
+                                destBlock = previousElement;
                         else if ( nextElement && nextElement.getName
-                                          && !( nextElement.getName() in nonExitableElementNames ) )
-                                enterBlock = nextElement;
+                                          && !( nextElement.getName() in nonExitableElementNames )
+                                          && range.moveToElementEditStart( nextElement, true ) )
+                                destBlock = nextElement;
 
                         // Not all blocks are editable, e.g. <hr />, further checking it.(#3994)
                         if( ( !count
                                   || ( firstChild = children.getItem( 0 ) ) && firstChild.is && firstChild.is( 'br' ) )
-                                && enterBlock
-                                && range.moveToElementEditStart( enterBlock ) )
+                                && destBlock )
                         {
                                 fixedBlock.remove();
+                                range.moveToElementEditStart( destBlock );
                                 range.select();
                         }
                 }

_source/core/dom/range.js

@@ -1587 +1587 @@
                  * @param {CKEDITOR.dom.element} targetElement The element into which
                  *              look for the editing spot.
                  */
-                moveToElementEditStart : function( targetElement )
+                moveToElementEditStart : function( targetElement, justTry )
                 {
                         var editableElement;
 
@@ -1603 +1603 @@
 
                         if ( editableElement )
                         {
-                                this.moveToPosition(editableElement, CKEDITOR.POSITION_AFTER_START);
+                                !justTry && this.moveToPosition( editableElement, CKEDITOR.POSITION_AFTER_START );
                                 return true;
                         }
                         else