Ticket #3240: 3240_2.patch

_source/core/dom/node.js

@@ -435 +435 @@
                         // Handle non element nodes (don't support contains nor sourceIndex).
                         if ( this.type != CKEDITOR.NODE_ELEMENT || otherNode.type != CKEDITOR.NODE_ELEMENT )
                         {
-                                if ( $.parentNode == $other )
+                                if ( otherNode.isAncestorOf( this ) )
                                         return CKEDITOR.POSITION_IS_CONTAINED + CKEDITOR.POSITION_FOLLOWING;
-                                else if ( $other.parentNode == $ )
+                                else if ( this.isAncestorOf( otherNode ) )
                                         return CKEDITOR.POSITION_CONTAINS + CKEDITOR.POSITION_PRECEDING;
                                 else if ( $.parentNode == $other.parentNode )
                                         return this.getIndex() < otherNode.getIndex() ? CKEDITOR.POSITION_PRECEDING : CKEDITOR.POSITION_FOLLOWING;
@@ -443 +443 @@
                                         return this.getIndex() < otherNode.getIndex() ? CKEDITOR.POSITION_PRECEDING : CKEDITOR.POSITION_FOLLOWING;
                                 else
                                 {
-                                        $ = $.parentNode;
-                                        $other = $other.parentNode;
+                                        // It's safe here to wrapping the text node with temporary element,
+                                        // and compare the wrapper's 'sourceIndex' instead. (#3240)
+                                        var wrappers = [];
+                                        function wrap( node )
+                                        {
+                                                var wrapper = CKEDITOR.document.createElement( 'span' );
+                                                wrapper.insertBefore( node );
+                                                wrapper.append( node );
+                                                wrappers.push( wrapper );
+                                                return wrapper.$;
+                                        }
+                                        function removeWrappers()
+                                        {
+                                                for ( var i = 0; i < wrappers.length ; i++ )
+                                                {
+                                                        var wrapper = wrappers[ i ];
+                                                        wrapper.getFirst().insertAfter( wrapper );
+                                                        wrapper.remove();
+                                                }
+                                        }
+                                        
+                                        var result = 
+                                                ( $.sourceIndex || wrap( this ).sourceIndex < 
+                                                   $other.sourceIndex || wrap( otherNode ).sourceIndex ) ? 
+                                                CKEDITOR.POSITION_PRECEDING :
+                                                CKEDITOR.POSITION_FOLLOWING;
+                                        removeWrappers();
+                                        return result;
                                 }
                         }
 
-                        if ( $.contains( $other ) )
-                                return CKEDITOR.POSITION_CONTAINS + CKEDITOR.POSITION_PRECEDING;
-
-                        if ( $other.contains( $ ) )
-                                return CKEDITOR.POSITION_IS_CONTAINED + CKEDITOR.POSITION_FOLLOWING;
-
                         if ( 'sourceIndex' in $ )
                         {
                                 return ( $.sourceIndex < 0 || $other.sourceIndex < 0 ) ? CKEDITOR.POSITION_DISCONNECTED :
@@ -516 +536 @@
                         }
                         return false;
                 },
+                
+                isAncestorOf : function( other )
+                {
+                        while( other && ( other = other.getParent() ) )
+                        {
+                                if ( this.equals( other ) )
+                                        return true;
+                        }
+                        return false;
+                },
 
                 move : function( target, toStart )
                 {