Ticket #3731: 3731.patch

_source/plugins/styles/plugin.js

@@ -213 +213 @@
                         }
 
                         // Check if the element can be somehow overriden.
-                        var override = getOverrides( this )[ element.getName() ] ;
+                        var overrides = getOverrides( this ),
+                                override = overrides[ element.getName() ] || overrides[ '*' ];
                         if ( override )
                         {
                                 // If no attributes have been defined, remove the element.
@@ -681 +682 @@
 
                 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 );
-                        }
+                        // 'override' attributes is in array form.
+                        if ( CKEDITOR.tools.isArray( attributes ) )
+                        {
+                                for ( var i = 0 ; i < attributes.length ; i++ )
+                                {
+                                        attName = attributes[i][0];
+                                        element.removeAttribute( attName );
+                                }
+                        }
+                        else
+                                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.
@@ -695 +706 @@
                 for ( var styleName in styles )
                         element.removeStyle( styleName );
 
-                // Now remove override styles on the element.
-                attributes = overrides[ element.getName() ];
-                if( attributes )
+                // Now remove override attributes on the element.
+                var override = ( overrides[ element.getName() ] || overrides [ '*' ] );
+                if( override && override.attributes )
                         removeAttrs();
                 removeNoAttribsElement( element );
         }
@@ -952 +963 @@
                                 var override = definition[i];
                                 var elementName;
                                 var overrideEl;
-                                var attrs;
+                                var attrs, styles;
 
                                 // If can be a string with the element name.
                                 if ( typeof override == 'string' )
@@ -962 +973 @@
                                 {
                                         elementName = override.element ? override.element.toLowerCase() : style.element;
                                         attrs = override.attributes;
+                                        styles = override.styles;
                                 }
 
                                 // We can have more than one override definition for the same
                                 // element name, so we attempt to simply append information to
                                 // it if it already exists.
                                 overrideEl = overrides[ elementName ] || ( overrides[ elementName ] = {} );
-
                                 if ( attrs )
                                 {
                                         // The returning attributes list is an array, because we
@@ -980 +991 @@
                                                 // Each item in the attributes array is also an array,
                                                 // where [0] is the attribute name and [1] is the
                                                 // override value.
-                                                overrideAttrs.push( [ attName.toLowerCase(), attrs[ attName ] ] );
+                                                overrideAttrs.push( [ attName.toLowerCase(),attrs[ attName ] ] );
                                         }
                                 }
-                        }
-                }
+                                if ( styles )
+                                {
+                                        var overrideAttrs = ( overrideEl.attributes = overrideEl.attributes || new Array() );
+                                        overrideAttrs.push( [ 'style', CKEDITOR.style.getStyleText( override ) ] );
+                                }
+                        }
+                }
 
                 return overrides;
         }