Ticket #5614: 5614.patch

_source/core/dom/text.js

@@ -119 +119 @@
                                 return this.$.nodeValue.substr( indexA );
                         else
                                 return this.$.nodeValue.substring( indexA, indexB );
+                },
+
+                /**
+                 * Whether the text node contains only empty-space AND has no visual impacts.
+                 */
+                isEmptySpaces : function()
+                {
+                        return !( CKEDITOR.tools.trim( this.getText() )
+                                || this.getAscendant( 'pre' ) );
                 }
         });

_source/core/dom/node.js

@@ -209 +209 @@
                                 {
                                         for ( var i = 0 ; i < parentNode.childNodes.length ; i++ )
                                         {
-                                                var candidate = parentNode.childNodes[i];
+                                                var candidate = new CKEDITOR.dom.node( parentNode.childNodes[ i ] );
 
+                                                if ( candidate.type == CKEDITOR.NODE_TEXT
+                                                        && candidate.isEmptySpaces() )
+                                                {
+                                                        continue;
+                                                }
+
                                                 if ( normalized &&
-                                                                candidate.nodeType == 3 &&
-                                                                candidate.previousSibling &&
-                                                                candidate.previousSibling.nodeType == 3 )
+                                                                candidate.type == CKEDITOR.NODE_TEXT &&
+                                                                candidate.getPrevious() &&
+                                                                candidate.getPrevious().type == CKEDITOR.NODE_TEXT )
                                                 {
                                                         continue;
                                                 }
 
                                                 currentIndex++;
 
-                                                if ( candidate == node )
+                                                if ( candidate.$ == node )
                                                         break;
                                         }
 

_source/core/dom/range.js

@@ -500 +500 @@
                                         startOffset += previous.getLength();
                                 }
 
+                                // Exclude empty-spaces-only nodes from start. (#5614)
+                                var previousOffset = startOffset - 1;
+                                while ( startContainer.type == CKEDITOR.NODE_ELEMENT
+                                                && previousOffset >= 0 )
+                                {
+                                        var child = startContainer.getChild( previousOffset-- );
+                                        if ( child.type == CKEDITOR.NODE_TEXT
+                                                && child.isEmptySpaces() )
+                                                startOffset--;
+                                }
+
                                 // Process the end only if not normalized.
                                 if ( !this.isCollapsed )
                                 {
@@ -527 +538 @@
                                                 endContainer = previous;
                                                 endOffset += previous.getLength();
                                         }
-                                }
-                        }
+
+                                        // Exclude empty-spaces-only nodes from end. (#5614)
+                                        previousOffset = endOffset - 1;
+                                        while ( endContainer.type == CKEDITOR.NODE_ELEMENT
+                                                        && previousOffset >= 0 )
+                                        {
+                                                child = endContainer.getChild( previousOffset-- );
+                                                if ( child.type == CKEDITOR.NODE_TEXT
+                                                        && child.isEmptySpaces() )
+                                                        endOffset--;
+                                        }
+                                }
+                        }
 
                         return {
                                 start           : startContainer.getAddress( normalized ),
@@ -552 +574 @@
                                 var endContainer        = bookmark.end && this.document.getByAddress( bookmark.end, bookmark.normalized ),
                                         endOffset       = bookmark.endOffset;
 
+                                if ( startContainer.type == CKEDITOR.NODE_ELEMENT )
+                                {
+                                        var children = startContainer.getChildren();
+                                        for ( var i = 0, count = children.count(); i < count ; i++ )
+                                        {
+                                                var child = children.getItem( i );
+                                                if ( child.type == CKEDITOR.NODE_TEXT
+                                                        && child.isEmptySpaces() )
+                                                {
+                                                        startOffset--;
+                                                }
+                                        }
+                                }
+
                                 // Set the start boundary.
                                 this.setStart( startContainer, startOffset );
 
                                 // Set the end boundary. If not available, collapse it.
                                 if ( endContainer )
+                                {
+                                        if ( endContainer.type == CKEDITOR.NODE_ELEMENT )
+                                        {
+                                                children = endContainer.getChildren();
+                                                for ( i = 0, count = children.count(); i < count ; i++ )
+                                                {
+                                                        child = children.getItem( i );
+                                                        if ( child.type == CKEDITOR.NODE_TEXT
+                                                                && child.isEmptySpaces() )
+                                                        {
+                                                                endOffset--;
+                                                        }
+                                                }
+                                        }
+
                                         this.setEnd( endContainer, endOffset );
+                                }
                                 else
+                                {
                                         this.collapse( true );
-                        }
+                                }
+                        }
                         else                                    // Created with createBookmark().
                         {
                                 var serializable = bookmark.serializable,

_source/core/dom/document.js

@@ -125 +125 @@
 
                                 for (var j = 0 ; j < $.childNodes.length ; j++ )
                                 {
-                                        var candidate = $.childNodes[ j ];
+                                        var candidate = new CKEDITOR.dom.node( $.childNodes[ j ] );
 
                                         if ( normalized === true &&
-                                                        candidate.nodeType == 3 &&
-                                                        candidate.previousSibling &&
-                                                        candidate.previousSibling.nodeType == 3 )
+                                                        candidate.type == CKEDITOR.NODE_TEXT &&
+                                                        candidate.getPrevious() &&
+                                                        candidate.getPrevious().type == CKEDITOR.NODE_TEXT )
                                         {
                                                 continue;
                                         }
 
+                                        if ( candidate.type == CKEDITOR.NODE_TEXT
+                                                && candidate.isEmptySpaces() )
+                                        {
+                                                continue;
+                                        }
+
                                         currentIndex++;
 
                                         if ( currentIndex == target )
                                         {
-                                                $ = candidate;
+                                                $ = candidate.$;
                                                 break;
                                         }
                                 }