Index: CKEditor/trunk/CHANGES.html
===================================================================
--- CKEditor/trunk/CHANGES.html (revision 6414)
+++ CKEditor/trunk/CHANGES.html (revision 6415)
@@ -48,4 +48,5 @@
#7102 : "Replacing Div" sample didn't work when double clicking inside of formatted text.
#7088 : Loading of plugins failed on new instances of the editor after special character dialog has been used.
+ #6215 : Removal of inline styles now also removes overrides.
Updated the following language files:
- #7124 : Czech;
Index: CKEditor/trunk/_source/plugins/styles/plugin.js
===================================================================
--- CKEditor/trunk/_source/plugins/styles/plugin.js (revision 6414)
+++ CKEditor/trunk/_source/plugins/styles/plugin.js (revision 6415)
@@ -704,6 +704,8 @@
*/
element.mergeSiblings();
- removeFromElement( this, element );
-
+ if ( element.getName() == this.element )
+ removeFromElement( this, element );
+ else
+ removeOverrides( element, getOverrides( this )[ element.getName() ] );
}
}