Ticket #6103: 6103_2.patch

_source/plugins/styles/plugin.js

@@ -102 +102 @@
                         :
                                 CKEDITOR.STYLE_INLINE;
 
+                // Inline styles must leave read-only elements retained. (#6103)
+                if ( this.type == CKEDITOR.STYLE_INLINE )
+                {
+                        styleDefinition.parentRule = CKEDITOR.tools.override( styleDefinition.parentRule,
+                        function( org )
+                        {
+                                return function( element ) { return org && org( element ) || !element.isReadOnly(); }
+                        });
+                }
+                
                 this._ =
                 {
                         definition : styleDefinition
@@ -464 +474 @@
 
                                                 }
                                         }
-                                        else
-                                                applyStyle = true;
+
                                 }
                                 else
                                         applyStyle = true;

_source/plugins/selection/plugin.js

@@ -792 +792 @@
                                                                 walkerRange.setEndAfter( endContainer );
                                                 }
 
-                                                // Looking for non-editable element inside the range.
+                                                // Looking for non-editable blocks inside the range.
                                                 var walker = new CKEDITOR.dom.walker( walkerRange );
                                                 walker.evaluator = function( node )
                                                 {
                                                         if ( node.type == CKEDITOR.NODE_ELEMENT
-                                                                && node.getAttribute( 'contenteditable' ) == 'false' )
+                                                                && node.getAttribute( 'contenteditable' ) == 'false'
+                                                                && node.isBlockBoundary() )
                                                         {
                                                                 var newRange = range.clone();
                                                                 range.setEndBefore( node );

_source/plugins/colorbutton/plugin.js

@@ -101 +101 @@
 
                                                 colorStyle.childRule = type == 'back' ?
                                                         // It's better to apply background color as the innermost style. (#3599)
-                                                        function(){ return false; } :
+                                                        function( element ){ return element.isReadOnly(); } :
                                                         // Fore color style must be applied inside links instead of around it.
-                                                        function( element ){ return element.getName() != 'a'; };
+                                                        function( element ){ return element.isReadOnly() || element.getName() != 'a'; };
 
                                                 new CKEDITOR.style( colorStyle, { color : color } ).apply( editor.document );
                                         }