Ticket #3453: 3453.patch

_source/core/dom/range.js

@@ -473 +473 @@
                                 }
 
                                 // Process the end only if not normalized.
-                                if ( !this.isCollapsed )
+                                if ( !this.collapsed )
                                 {
                                         // Find out if the start is pointing to a text node that
                                         // will be normalized.
@@ -501 +501 @@
                                         }
                                 }
                         }
+                        // Never place the carot inside empty node, which will be removed 
+                        // during 'innerHTML' retrieving, make the bookmark positon incorrect. (#3453)
+                        while ( startContainer.type == CKEDITOR.NODE_TEXT
+                                && !CKEDITOR.tools.trim( startContainer.getText() ) )
+                        {
+                                var parent = startContainer.getParent();
+                                startOffset = CKEDITOR.tools.indexOf( 
+                                        Array.prototype.slice.call( parent.$.childNodes ), startContainer.$ );
+                                startContainer = parent; 
+                        }
+                        if( !this.collapsed )
+                        {
+                                while ( endContainer.type == CKEDITOR.NODE_TEXT
+                                        && !CKEDITOR.tools.trim( endContainer.getText() ) )
+                                {
+                                        parent = endContainer.getParent();
+                                        endOffset = CKEDITOR.tools.indexOf( 
+                                                Array.prototype.slice.call( parent.$.childNodes ), endContainer.$ );
+                                        endContainer = parent; 
+                                }
+                        }
 
                         return {
                                 start           : startContainer.getAddress( normalized ),
-                                end                     : this.isCollapsed ? null : endContainer.getAddress( normalized ),
+                                end                     : this.collapsed ? null : endContainer.getAddress( normalized ),
                                 startOffset     : startOffset,
                                 endOffset       : endOffset,
                                 normalized      : normalized,