Ticket #3505: 3505_2.patch

_source/core/dom/range.js

@@ -31 +31 @@
         // V2
         var execContentsAction = function( range, action, docFrag )
         {
+                range.optimizeBookmark();
+                
                 var startNode   = range.startContainer;
                 var endNode             = range.endContainer;
 
@@ -653 +655 @@
                         }
                 },
 
+                /**
+                 * Move the range out of bookmark nodes if they're been the container.
+                 */
+                optimizeBookmark: function()
+                {
+                        var startNode = this.startContainer,
+                                endNode = this.endContainer;
+
+                        if ( startNode.is && startNode.is( 'span' )
+                                && startNode.hasAttribute( '_fck_bookmark' ) )
+                                this.setStartAt( startNode, CKEDITOR.POSITION_BEFORE_START );
+                        if ( endNode && endNode.is && endNode.is( 'span' )
+                                && endNode.hasAttribute( '_fck_bookmark' ) )
+                                this.setEndAt( endNode,  CKEDITOR.POSITION_AFTER_END );
+                },
+
                 trim : function( ignoreStart, ignoreEnd )
                 {
                         var startContainer = this.startContainer;
@@ -1487 +1505 @@
                                 else if ( editableElement )
                                         break ;         // If we already found an editable element, stop the loop.
 
-                                targetElement = targetElement.getFirst();
+                                // Avoid anchoring inside bookmark nodes.
+                                if ( editableElement
+                                                && ( editableElement.getName( 'span' )
+                                                && editableElement.hasAttribute( '_fck_bookmark' ) ) )
+                                        targetElement = editableElement.getNext();
+                                else
+                                        targetElement = targetElement.getFirst();
                         }
 
                         if ( editableElement )