Ticket #5931: 5931_6.patch

_source/plugins/styles/plugin.js

@@ -478 +478 @@
                         if ( applyStyle && styleRange && !styleRange.collapsed )
                         {
                                 // Build the style element, based on the style object definition.
-                                var styleNode = getElement( this, document );
+                                var styleNode = getElement( this, document ),
+                                        styleHasAttrs = styleNode.hasAttributes();
 
                                 // Get the element that holds the entire range.
                                 var parent = styleRange.getCommonAncestor();
 
+                                var removeList = {
+                                        styles : {},
+                                        attrs : {},
+                                        // Styles cannot be removed.
+                                        blockedStyles : {},
+                                        // Attrs cannot be removed.
+                                        blockedAttrs : {}
+                                };
+
+                                var attName, styleName, value;
+
                                 // Loop through the parents, removing the redundant attributes
                                 // from the element to be applied.
                                 while ( styleNode && parent )
                                 {
                                         if ( parent.getName() == elementName )
                                         {
-                                                for ( var attName in def.attributes )
+                                                for ( attName in def.attributes )
                                                 {
-                                                        if ( styleNode.getAttribute( attName ) == parent.getAttribute( attName ) )
-                                                                styleNode.removeAttribute( attName );
-                                                }
+                                                        if ( removeList.blockedAttrs[ attName ] || !( value = parent.getAttribute( styleName ) ) )
+                                                                continue;
 
-                                                for ( var styleName in def.styles )
-                                                {
-                                                        if ( styleNode.getStyle( styleName ) == parent.getStyle( styleName ) )
-                                                                styleNode.removeStyle( styleName );
+                                                        if ( styleNode.getAttribute( attName ) == value )
+                                                                removeList.attrs[ attName ] = 1;
+                                                        else
+                                                                removeList.blockedAttrs[ attName ] = 1;
                                                 }
 
-                                                if ( !styleNode.hasAttributes() )
+                                                for ( styleName in def.styles )
                                                 {
-                                                        styleNode = null;
-                                                        break;
+                                                        if ( removeList.blockedStyles[ styleName ] || !( value = parent.getStyle( styleName ) ) )
+                                                                continue;
+
+                                                        if ( styleNode.getStyle( styleName ) == value )
+                                                                removeList.styles[ styleName ] = 1;
+                                                        else
+                                                                removeList.blockedStyles[ styleName ] = 1;
                                                 }
                                         }
 
                                         parent = parent.getParent();
                                 }
 
+                                for ( attName in removeList.attrs )
+                                        styleNode.removeAttribute( attName );
+
+                                for ( styleName in removeList.styles )
+                                        styleNode.removeStyle( styleName );
+
+                                if ( styleHasAttrs && !styleNode.hasAttributes() )
+                                        styleNode = null;
+
                                 if ( styleNode )
                                 {
                                         // Move the contents of the range to the style element.
@@ -536 +561 @@
                                         if ( !CKEDITOR.env.ie )
                                                 styleNode.$.normalize();
                                 }
+                                // Style already inherit from parents, left just to clear up any internal overrides. (#5931)
+                                else
+                                {
+                                        styleNode = new CKEDITOR.dom.element( 'span' );
+                                        styleRange.extractContents().appendTo( styleNode );
+                                        styleRange.insertNode( styleNode );
+                                        removeFromInsideElement( this, styleNode );
+                                        styleNode.remove( true );
+                                }
 
                                 // Style applied, let's release the range, so it gets
                                 // re-initialization in the next loop.