Ticket #3576: 3576_2.patch

_source/plugins/styles/plugin.js

@@ -867 +867 @@
         function removeFromElement( style, element )
         {
                 var def = style._.definition,
-                        attributes = def.attributes,
+                        attributes = CKEDITOR.tools.extend( {}, def.attributes, getOverrides( style )[ element.getName() ] ),
                         styles = def.styles,
-                        overrides = getOverrides( style );
+                        // If the style is only about the element itself, we have to remove the element.
+                        removeEmpty = CKEDITOR.tools.isEmpty( attributes ) && CKEDITOR.tools.isEmpty( styles );
 
-                function removeAttrs()
-                {
-                        for ( var attName in attributes )
-                        {
-                                // The 'class' element value must match (#1318).
-                                if ( attName == 'class' && element.getAttribute( attName ) != attributes[ attName ] )
-                                        continue;
-                                element.removeAttribute( attName );
-                        }
-                }
+                // Remove definition attributes/style from the elemnt.
+                for ( var attName in attributes )
+                {
+                        // The 'class' element value must match (#1318).
+                        if ( attName == 'class' && element.getAttribute( attName ) != attributes[ attName ] )
+                                continue;
+                        element.removeAttribute( attName );
+                        removeEmpty = true;
+                }
 
-                // Remove definition attributes/style from the elemnt.
-                removeAttrs();
                 for ( var styleName in styles )
+                {
                         element.removeStyle( styleName );
+                        removeEmpty = true;
+                }
 
-                // Now remove override styles on the element.
-                attributes = overrides[ element.getName() ];
-                if ( attributes )
-                        removeAttrs();
-                removeNoAttribsElement( element );
+                removeEmpty && removeNoAttribsElement( element );
         }
 
         // Removes a style from inside an element.