Ticket #5336: 5336.patch

_source/plugins/styles/plugin.js

@@ -137 +137 @@
                         return ( this.removeFromRange =
                                                 this.type == CKEDITOR.STYLE_INLINE ?
                                                         removeInlineStyle
+                                                : this.type == CKEDITOR.STYLE_OBJECT ?
+                                                        removeObjectStyle
                                                 : null ).call( this, range );
                 },
 
@@ -719 +721 @@
                 element && setupElement( element, this );
         }
 
+        function removeObjectStyle( range )
+        {
+                var root = range.getCommonAncestor( true, true ),
+                                element = root.getAscendant( this.element, true );
+
+                if ( !element )
+                        return;
+
+                var style = this;
+                var def = style._.definition;
+                var attributes = def.attributes;
+                var styles = CKEDITOR.style.getStyleText( def );
+
+                // Remove all defined attributes.
+                if ( attributes )
+                {
+                        for ( var att in attributes )
+                        {
+                                element.removeAttribute( att, attributes[ att ] );
+                        }
+                }
+
+                // Assign all defined styles.
+                if ( def.styles )
+                {
+                        for ( var i in def.styles )
+                        {
+                                if ( !def.styles.hasOwnProperty( i ) )
+                                        continue;
+                                
+                                element.removeStyle( i );
+                        }
+                }
+        }
+
         function applyBlockStyle( range )
         {
                 // Serializible bookmarks is needed here since
@@ -1080 +1117 @@
                 }
 
                 // Assign all defined styles.
-                if ( styles )
-                        el.setAttribute( 'style', styles );
+                if ( def.styles )
+                {
+                        for ( var i in def.styles )
+                        {
+                                if ( !def.styles.hasOwnProperty( i ) )
+                                        continue;
 
+                                el.setStyle( i, def.styles[ i ] );
+                        }
+                }
+
                 return el;
         }
 

_source/plugins/stylescombo/plugin.js

@@ -108 +108 @@
 
                                                 if ( style.type == CKEDITOR.STYLE_INLINE && style.checkActive( elementPath ) )
                                                         style.remove( editor.document );
+                                                else if ( style.type == CKEDITOR.STYLE_OBJECT && style.checkActive( elementPath ) )
+                                                        style.remove( editor.document );
                                                 else
                                                         style.apply( editor.document );