Ticket #3133: 3313_2.patch

_source/plugins/wysiwygarea/plugin.js

@@ -68 +68 @@
 
                                 // Remove the original contents.
                                 range.deleteContents();
+                                
+                                // Place the editing carot after the editing end of previous node. 
+                                range.moveToElementEditEnd( range.getBoundaryNodes().endNode );
 
                                 clone = !i && element || element.clone( true );
 

_source/core/dom/range.js

@@ -1485 +1485 @@
                         
                         return walker.checkForward();
                 },
-
                 /**
-                 * Moves the range boundaries to the first editing point inside an
+                 * Moves the range boundaries to the first/end editing point 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>).
@@ -1492 +1491 @@
                  * "<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;
 
@@ -1505 +1505 @@
                                 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 );
+                },
+
+                /**
+                 *@see {CKEDITOR.dom.range.moveToElementEditablePosition}
+                 */
+                moveToElementEditStart : function( target )
+                {
+                        this.moveToElementEditablePosition( target );
+                },
+
+                /**
+                 *@see {CKEDITOR.dom.range.moveToElementEditablePosition}
+                 */
+                moveToElementEditEnd : function( target )
+                {
+                        this.moveToElementEditablePosition( target, true );
                 },
 
                 getTouchedStartNode : function()