Ticket #7492: 7492_3.patch

_samples/output_xhtml.html

@@ -98 +98 @@
                                                 font_style :
                                                 {
                                                                 element         : 'span',
-                                                                attributes              : { 'class' : '#(family)' }
+                                                                attributes              : { 'class' : '#(family)' },
+                                                                overrides       : [ { element : 'span', attributes : { 'class' : /^Font(?:Comic|Courier|Times)$/ } } ]
                                                 },
 
                                                 /*
@@ -108 +109 @@
                                                 fontSize_style :
                                                         {
                                                                 element         : 'span',
-                                                                attributes      : { 'class' : '#(size)' }
+                                                                attributes      : { 'class' : '#(size)' },
+                                                                overrides       : [ { element : 'span', attributes : { 'class' : /^Font(?:Smaller|Larger|Small|Big|Double)$/ } } ]
                                                         } ,
 
                                                 /*
@@ -120 +122 @@
                                                 colorButton_foreStyle :
                                                         {
                                                                 element : 'span',
-                                                                attributes : { 'class' : '#(color)' }
+                                                                attributes : { 'class' : '#(color)' },
+                                                                overrides       : [ { element : 'span', attributes : { 'class' : /^FontColor(?:1|2|3)$/ } } ]
                                                         },
 
                                                 colorButton_backStyle :
                                                         {
                                                                 element : 'span',
-                                                                attributes : { 'class' : '#(color)BG' }
+                                                                attributes : { 'class' : '#(color)BG' },
+                                                                overrides       : [ { element : 'span', attributes : { 'class' : /^FontColor(?:1|2|3)BG$/ } } ]
                                                         },
 
                                                 /*

_source/plugins/styles/plugin.js

@@ -1132 +1132 @@
         function removeFromElement( style, element )
         {
                 var def = style._.definition,
-                        attributes = CKEDITOR.tools.extend( {}, def.attributes, getOverrides( style )[ element.getName() ] ),
+                        attributes = def.attributes,
                         styles = def.styles,
+                        overrides = getOverrides( style )[ element.getName() ],
                         // If the style is only about the element itself, we have to remove the element.
                         removeEmpty = CKEDITOR.tools.isEmpty( attributes ) && CKEDITOR.tools.isEmpty( styles );
 
@@ -1159 +1160 @@
                         element.removeStyle( styleName );
                 }
 
+                // Remove overrides, but don't remove the element if it's a block element
+                removeOverrides( element, overrides, blockElements[ element.getName() ] ) ;
+
                 if ( removeEmpty )
                 {
                         !CKEDITOR.dtd.$block[ element.getName() ] || style._.enterMode == CKEDITOR.ENTER_BR && !element.hasAttributes() ?
@@ -1200 +1204 @@
          *  Note: Remove the element if no attributes remain.
          * @param {Object} element
          * @param {Object} overrides
+         * @param {Boolean} Don't remove the element
          */
-        function removeOverrides( element, overrides )
+        function removeOverrides( element, overrides, dontRemove )
         {
                 var attributes = overrides && overrides.attributes ;
 
@@ -1229 +1234 @@
                         }
                 }
 
-                removeNoAttribsElement( element );
+                if ( !dontRemove )
+                        removeNoAttribsElement( element );
         }
 
         // If the element has no more attributes, remove it.