Changeset 5744

Timestamp:

07/26/10 22:30:45 (3 years ago)

Author:

fredck

Message:

#6004 : Styles were not being applied to collapsed selections.

Location:

CKEditor/branches/versions/3.4.x/_source

Files:

• core/dom/range.js (modified) (6 diffs)
• plugins/styles/plugin.js (modified) (1 diff)

CKEditor/branches/versions/3.4.x/_source/core/dom/range.js

@@ -398 +398 @@
                         var baseId;
                         var clone;
+                        var collapsed = this.collapsed;
 
                         startNode = this.document.createElement( 'span' );
@@ -414 +415 @@
 
                         // If collapsed, the endNode will not be created.
-                        if ( !this.collapsed )
+                        if ( !collapsed )
                         {
                                 endNode = startNode.clone();
@@ -443 +444 @@
                                 startNode : serializable ? baseId + 'S' : startNode,
                                 endNode : serializable ? baseId + 'E' : endNode,
-                                serializable : serializable
+                                serializable : serializable,
+                                collapsed : collapsed
                         };
                 },
@@ -466 +468 @@
                                 endOffset       = this.endOffset;
 
+                        var collapsed = this.collapsed;
+
                         var child, previous;
 
@@ -502 +506 @@
 
                                 // Process the end only if not normalized.
-                                if ( !this.isCollapsed )
+                                if ( !collapsed )
                                 {
                                         // Find out if the start is pointing to a text node that
@@ -533 +537 @@
                         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.
                         };

CKEditor/branches/versions/3.4.x/_source/plugins/styles/plugin.js

@@ -1283 +1283 @@
                         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 );
         }
 })();