Changeset 6415 for CKEditor/trunk

Timestamp:

02/09/11 15:43:05 (2 years ago)

Author:

Saare

Message:

#6215: Overrides were not being removed on inline style removal.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/styles/plugin.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -48 +48 @@
                 <li><a href="http://dev.ckeditor.com/ticket/7102">#7102</a> : "Replacing Div" sample didn't work when double clicking inside of formatted text.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/7088">#7088</a> : Loading of plugins failed on new instances of the editor after special character dialog has been used.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/6215">#6215</a> : Removal of inline styles now also removes overrides.</li>
                 <li>Updated the following language files:<ul>
                         <li><a href="http://dev.ckeditor.com/ticket/7124">#7124</a> : Czech;</li>

CKEditor/trunk/_source/plugins/styles/plugin.js

@@ -704 +704 @@
                                                  */
                                                 element.mergeSiblings();
-                                                removeFromElement( this, element );
-
+                                                if ( element.getName() == this.element )
+                                                        removeFromElement( this, element );
+                                                else
+                                                        removeOverrides( element, getOverrides( this )[ element.getName() ] );
                                         }
                                 }