Ticket #3842: 3842.patch

_source/core/dom/text.js

@@ -68 +68 @@
                 },
 
                 /**
+                 * Combine the specified text node with this node by merging their text content.
+                 * @param {CKEDITOR.dom.text} The node to merge with.
+                 */
+                merge : function( node )
+                {
+                        this.$.nodeValue = this.getText() + node.getText();
+                        node.remove();
+                        return this;
+                },
+
+                /**
                  * Breaks this text node into two nodes at the specified offset,
                  * keeping both in the tree as siblings. This node then only contains
                  * all the content up to the offset point. A new text node, which is

_source/tests/core/dom/documentfragment.html

@@ -119 +119 @@
                         frag.ltrim();
                         var ct = new CKEDITOR.dom.element( 'div' );
                         ct.append( frag );
-                        assert.areSame( 'text\t\n', ct.getText() );
+                        assert.areSame( 'text\n', ct.getText() );
                 },
 
                 test_ltrim_ie : function()
@@ -154 +154 @@
                         var ct = new CKEDITOR.dom.element( 'div' );
                         ct.append( frag );
 
-                        assert.areSame( '\t\ntext', ct.getText() );
+                        assert.areSame( '\ntext', ct.getText() );
                 },
 
                 /**

_source/tests/core/dom/range.html

@@ -957 +957 @@
                         assert.areSame( document.getElementById( '_EnlargeP8' ), range.startContainer.$, 'range.startContainer' );
                         assert.areSame( 0, range.startOffset, 'range.startOffset' );
                         assert.areSame( document.getElementById( '_EnlargeP8' ), range.endContainer.$, 'range.endContainer' );
-                        assert.areSame( 4, range.endOffset, 'range.endOffset' );
+                        assert.areSame( 3, range.endOffset, 'range.endOffset' );
                         assert.isFalse( range.collapsed, 'range.collapsed' );
                 },
 
@@ -2243 +2243 @@
         };
 })() );
 
-//window.onload = tests.test_trim;
+//window.onload = tests.test_enlarge_list2;
         //]]>
         </script>
 </head>
@@ -2374 +2374 @@
                 <p id="_EnlargeP4">Test <i id="_EnlargeI4"> Enlarge</i></p>
                 <p id="_EnlargeP5">Test <i id="_EnlargeI5">Enlarge</i></p>
                 <p id="_EnlargeP6">Test <i id="_EnlargeI6"><b></b>Enlarge</i></p>
-                <p id="_EnlargeP7">Test <span id="S1"></span>List<br/ >Item Enlarge</p>
+                <p id="_EnlargeP7">Test <span id="S1"></span>List<br />Item Enlarge</p>
                 <p id="_EnlargeP8">Test <span id="S2"></span>List<span id="E2"></span> <br /><br />Item Enlarge</p>
                 <p id="_EnlargeP9">Test List <br /><span id="S3"></span><br />Item Enlarge</p>
                 <p id="_EnlargeP10">Test List <br /><br />Item<span id="S4"></span> Enlarge</p>

_source/core/dom/range.js

@@ -554 +554 @@
                         {
                                 var serializable = bookmark.serializable,
                                         startNode       = serializable ? this.document.getById( bookmark.startNode ) : bookmark.startNode,
-                                        endNode         = serializable ? this.document.getById( bookmark.endNode ) : bookmark.endNode;
+                                        startPrevious =  startNode.getPrevious(),
+                                        startNext = startNode.getNext(),
+                                        endNode         = serializable ? this.document.getById( bookmark.endNode ) : bookmark.endNode,
+                                        fixBrokenStart = startPrevious && startPrevious.type == CKEDITOR.NODE_TEXT
+                                                                         && startNext && startNext.type == startPrevious.type;
 
-                                // Set the range start at the bookmark start node position.
-                                this.setStartBefore( startNode );
-
+
+                                // Repairing the broken text nodes around bookmarks.(#3842)
+                                if ( fixBrokenStart )
+                                {
+                                        var offset = startPrevious.getLength();
+                                        startPrevious.merge( startNext );
+                                        this.setStart( startPrevious, offset );
+                                }
+                                else
+                                {
+                                        // Set the range start at the bookmark start node position.
+                                        this.setStartBefore( startNode );
+                                }
                                 // Remove it, because it may interfere in the setEndBefore call.
                                 startNode.remove();
 
+                                var endPrevious = endNode && endNode.getPrevious(),
+                                        endNext = endNode && endNode.getNext(),
+                                        fixBrokenEnd = endPrevious && endPrevious.type == CKEDITOR.NODE_TEXT
+                                                                          && endNext && endNext.type == endPrevious.type;
+
                                 // Set the range end at the bookmark end node position, or simply
                                 // collapse it if it is not available.
-                                if ( endNode )
+                                if ( fixBrokenEnd )
                                 {
+                                        offset = endPrevious.getLength();
+                                        endPrevious.merge( endNext );
+                                        this.setEnd( endPrevious, offset );
+                                }
+                                else if( endNode )
+                                {
                                         this.setEndBefore( endNode );
-                                        endNode.remove();
                                 }
                                 else
                                         this.collapse( true );
+                                endNode && endNode.remove();
                         }
                 },
 

_source/tests/core/dom/text.html

@@ -114 +114 @@
                         assert.areSame( 5, parent.getChildren().count(), 'Child nodes num doesn\'t match after split' );
                 },
 
+                test_merge : function()
+                {
+                        var parent = CKEDITOR.document.getById( 'playground2' );
+                        parent.setHtml( '' );
+                        var text1 = CKEDITOR.document.createText( 'text1' ),
+                                text2 = CKEDITOR.document.createText( 'text2' );
+                        parent.append( text1 );
+                        parent.append( text2 );
+
+                        var newtext = text1.merge( text2 );
+                        assert.areSame( 'text1text2', newtext.getText(), 'Merge text nodes result incorrect.' );
+                        assert.areSame( newtext.$, parent.getFirst().$ );
+                        assert.isNull( text2.getParent() );
+                },
+
                 name : document.title
         };
 })() );

CHANGES.html

@@ -80 +80 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3730">#3730</a> : Indent is performing on the whole
                         block instead of selected lines in enterMode = BR.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3844">#3844</a> : Fixed UndoManager register keydown on obsoleted document</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3844">#3844</a> : Fixed text nodes been broken into pieces 
+                        after 'CKEDITOR.dom.range::createBookmark'.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>