Changeset 6983


Ignore:
Timestamp:
05/27/2011 09:32:42 PM (4 years ago)
Author:
alfonsoml
Message:

#7492 Remove overrides of a style even if it's using the same element tag.

Location:
CKEditor/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CKEditor/trunk/CHANGES.html

    r6980 r6983  
    8686                <li><a href="http://dev.ckeditor.com/ticket/7584">#7584</a> : Start number of list style dialog now works with numbered list items.</li> 
    8787                <li><a href="http://dev.ckeditor.com/ticket/6975">#6975</a> : Definition list crashes IE6/7 on html output.</li> 
     88                <li><a href="http://dev.ckeditor.com/ticket/7492">#7492</a> : Overrides of Styles don't work on the same element tag.</li> 
    8889                <li>Updated the following language files:<ul> 
    8990                        <li><a href="http://dev.ckeditor.com/ticket/7834">#7834</a> : Dutch;</li> 
  • CKEditor/trunk/_source/plugins/styles/plugin.js

    r6919 r6983  
    11191119        { 
    11201120                var def = style._.definition, 
    1121                         attributes = CKEDITOR.tools.extend( {}, def.attributes, getOverrides( style )[ element.getName() ] ), 
     1121                        attributes = def.attributes, 
    11221122                        styles = def.styles, 
     1123                        overrides = getOverrides( style )[ element.getName() ], 
    11231124                        // If the style is only about the element itself, we have to remove the element. 
    11241125                        removeEmpty = CKEDITOR.tools.isEmpty( attributes ) && CKEDITOR.tools.isEmpty( styles ); 
     
    11451146                        element.removeStyle( styleName ); 
    11461147                } 
     1148 
     1149                removeOverrides( element, overrides ) ; 
    11471150 
    11481151                if ( removeEmpty ) 
Note: See TracChangeset for help on using the changeset viewer.
© 2003 – 2012 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy