Ticket #3133: 3133_3.patch

_source/plugins/wysiwygarea/plugin.js

@@ -76 +76 @@
 
                                 // Remove the original contents.
                                 range.deleteContents();
-
+                                
+                                // Place the carot right after the editing end of previous boundary node. (#3313)
+                                range.moveToElementEditEnd( range.getBoundaryNodes().endNode );
+
                                 clone = !i && element || element.clone( true );
 
                                 // If we're inserting a block at dtd-violated position, split
@@ -113 +116 @@
 
                         range.moveToPosition( lastElement, CKEDITOR.POSITION_AFTER_END );
 
-                        var next = lastElement.getNextSourceNode( true );
-                        if ( next && next.type == CKEDITOR.NODE_ELEMENT )
-                                range.moveToElementEditStart( next );
+                        if( isBlock )   // Place cursor at start of the block's next element.
+                        {
+                                var next = lastElement.getNextSourceNode( true );
+                                if ( next && next.type == CKEDITOR.NODE_ELEMENT )
+                                        range.moveToElementEditStart( next );
+                        }
 
                         selection.selectRanges( [ range ] );
 

_source/core/dom/range.js

@@ -1578 +1578 @@
 
                         return walker.checkForward();
                 },
-
                 /**
-                 * Moves the range boundaries to the first editing point inside an
+                 * Moves the range to the first/last editing position inside an
                  * element. For example, in an element tree like
                  * "<p><b><i></i></b> Text</p>", the start editing point is
                  * "<p><b><i>^</i></b> Text</p>" (inside <i>).
                  * @param {CKEDITOR.dom.element} targetElement The element into which
-                 *              look for the editing spot.
+                 *              look for the editing spot, it should be guaranteed to contains at least one editable position.
+                        @param {Boolean} isMoveToEnd Whether move to the end editable position.
                  */
-                moveToElementEditStart : function( targetElement )
+                moveToElementEditablePosition: function( targetElement, isMoveToEnd )
                 {
                         var editableElement;
 
@@ -1598 +1598 @@
                                 else if ( editableElement )
                                         break ;         // If we already found an editable element, stop the loop.
 
-                                targetElement = targetElement.getFirst();
+                                targetElement = targetElement[ isMoveToEnd? 'getLast' : 'getFirst' ].call( targetElement );
                         }
 
                         if ( editableElement )
                         {
-                                this.moveToPosition(editableElement, CKEDITOR.POSITION_AFTER_START);
+                                this.moveToPosition( editableElement,
+                                                isMoveToEnd ?
+                                                CKEDITOR.POSITION_BEFORE_END : CKEDITOR.POSITION_AFTER_START );
                                 return true;
                         }
                         else
@@ -1611 +1613 @@
                 },
 
                 /**
-                 * Get the single node enclosed within the range if there's one.
+                 *@see {CKEDITOR.dom.range.moveToElementEditablePosition}
                  */
-                getEnclosedNode : function()
+                moveToElementEditStart : function( target )
                 {
-                        var walkerRange = this.clone(),
-                                walker = new CKEDITOR.dom.walker( walkerRange ),
-                                isNotBookmarks = CKEDITOR.dom.walker.bookmark( true ),
-                                isNotWhitespaces = CKEDITOR.dom.walker.whitespaces( true ),
-                                evaluator = function( node )
-                                {
-                                        return isNotWhitespaces( node ) && isNotBookmarks( node );
-                                };
-                        walkerRange.evaluator = evaluator;
-                        var node = walker.next();
-                        walker.reset();
-                        return node && node.equals( walker.previous() ) ? node : null;
+                        return this.moveToElementEditablePosition( target );
+                },
+
+                /**
+                 *@see {CKEDITOR.dom.range.moveToElementEditablePosition}
+                 */
+                moveToElementEditEnd : function( target )
+                {
+                        return this.moveToElementEditablePosition( target, true );
                 },
 
                 getTouchedStartNode : function()