Changeset 6415 for CKEditor/trunk


Ignore:
Timestamp:
02/09/11 15:43:05 (4 years ago)
Author:
Saare
Message:

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

Location:
CKEditor/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CKEditor/trunk/CHANGES.html

    r6414 r6415  
    4848                <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> 
    4949                <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> 
     50                <li><a href="http://dev.ckeditor.com/ticket/6215">#6215</a> : Removal of inline styles now also removes overrides.</li> 
    5051                <li>Updated the following language files:<ul> 
    5152                        <li><a href="http://dev.ckeditor.com/ticket/7124">#7124</a> : Czech;</li> 
  • CKEditor/trunk/_source/plugins/styles/plugin.js

    r6411 r6415  
    704704                                                 */ 
    705705                                                element.mergeSiblings(); 
    706                                                 removeFromElement( this, element ); 
    707  
     706                                                if ( element.getName() == this.element ) 
     707                                                        removeFromElement( this, element ); 
     708                                                else 
     709                                                        removeOverrides( element, getOverrides( this )[ element.getName() ] ); 
    708710                                        } 
    709711                                } 
Note: See TracChangeset for help on using the changeset viewer.
© 2003 – 2012 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy