Ticket #6621: 6621_2.patch

_source/plugins/styles/plugin.js

@@ -1353 +1353 @@
         function applyStyle( document, remove )
         {
                 var selection = document.getSelection(),
-                        // Bookmark the range so we can re-select it after processing.
-                        bookmarks = selection.createBookmarks( 1 ),
-                        ranges = selection.getRanges( 1 ),
+                        ranges = selection.getRanges( true ),
                         func = remove ? this.removeFromRange : this.applyToRange,
                         range;
 
                 var iterator = ranges.createIterator();
                 while ( ( range = iterator.getNextRange() ) )
+                {
                         func.call( this, range );
+                }
 
-                if ( bookmarks.length == 1 && bookmarks[0].collapsed )
-                {
-                        selection.selectRanges( ranges );
-                        document.getById( bookmarks[ 0 ].startNode ).remove();
-                }
-                else
-                        selection.selectBookmarks( bookmarks );
-        }
+                selection.selectRanges( ranges );
+        }
 })();
 
 CKEDITOR.styleCommand = function( style )

_source/plugins/selection/plugin.js

@@ -1126 +1126 @@
                                                 if ( !between.collapsed )
                                                 {
                                                         between.shrink( CKEDITOR.NODE_ELEMENT, true );
-                                                        if ( between.getCommonAncestor().isReadOnly())
+                                                        var ancestor = between.getCommonAncestor(),
+                                                                enclosed = between.getEnclosedNode();
+
+                                                        // The following cases has to be considered:
+                                                        // 1. <span contenteditable="false">[placeholder]</span>
+                                                        // 2. <input contenteditable="false"  type="radio"/> (#6621)
+                                                        if ( ancestor.isReadOnly() || enclosed && enclosed.isReadOnly() )
                                                         {
                                                                 right.setStart( left.startContainer, left.startOffset );
                                                                 ranges.splice( i--, 1 );

_source/core/dom/range.js

@@ -1405 +1405 @@
                         // Fixing invalid range start inside dtd empty elements.
                         if( startNode.type == CKEDITOR.NODE_ELEMENT
                                 && CKEDITOR.dtd.$empty[ startNode.getName() ] )
-                                startNode = startNode.getParent(), startOffset = startNode.getIndex();
+                                startOffset = startNode.getIndex(), startNode = startNode.getParent();
 
                         this.startContainer     = startNode;
                         this.startOffset        = startOffset;