Ticket #6004: 6004_2.patch

_source/core/dom/range.js

@@ -397 +397 @@
                         var startNode, endNode;
                         var baseId;
                         var clone;
+                        var collapsed = this.collapsed;
 
                         startNode = this.document.createElement( 'span' );
                         startNode.setAttribute( '_fck_bookmark', 1 );
@@ -413 +414 @@
                         }
 
                         // If collapsed, the endNode will not be created.
-                        if ( !this.collapsed )
+                        if ( !collapsed )
                         {
                                 endNode = startNode.clone();
                                 endNode.setHtml( ' ' );
@@ -442 +443 @@
                         return {
                                 startNode : serializable ? baseId + 'S' : startNode,
                                 endNode : serializable ? baseId + 'E' : endNode,
-                                serializable : serializable
+                                serializable : serializable,
+                                collapsed : collapsed
                         };
                 },
 
@@ -465 +467 @@
                         var startOffset = this.startOffset,
                                 endOffset       = this.endOffset;
 
+                        var collapsed = this.collapsed;
+
                         var child, previous;
 
                         // If there is no range then get out of here.
@@ -501 +505 @@
                                 }
 
                                 // Process the end only if not normalized.
-                                if ( !this.isCollapsed )
+                                if ( !collapsed )
                                 {
                                         // Find out if the start is pointing to a text node that
                                         // will be normalized.
@@ -532 +536 @@
 
                         return {
                                 start           : startContainer.getAddress( normalized ),
-                                end                     : this.isCollapsed ? null : endContainer.getAddress( normalized ),
+                                end                     : collapsed ? null : endContainer.getAddress( normalized ),
                                 startOffset     : startOffset,
                                 endOffset       : endOffset,
                                 normalized      : normalized,
+                                collapsed       : collapsed,
                                 is2                     : true          // It's a createBookmark2 bookmark.
                         };
                 },

_source/plugins/styles/plugin.js

@@ -1282 +1282 @@
                 while ( ( range = iterator.getNextRange() ) )
                         func.call( this, range );
 
-                selection.selectBookmarks( bookmarks );
+                if ( bookmarks.length == 1 && bookmarks[0].collapsed )
+                {
+                        selection.selectRanges( ranges );
+                        bookmarks[0].startNode.remove();
+                }
+                else
+                        selection.selectBookmarks( bookmarks );
         }
 })();