Changeset 7198


Ignore:
Timestamp:
08/12/2011 05:59:06 PM (3 years ago)
Author:
garry.yao
Message:

#6908: Fixing color style application on link surround by other inline elements.

Location:
CKEditor/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CKEditor/trunk/CHANGES.html

    r7197 r7198  
    5454                <li><a href="http://dev.ckeditor.com/ticket/7943">#7943</a> : CSS conflict no longer appears when the page styles set the <code>float</code> property of <code>label</code> elements.</li> 
    5555                <li><a href="http://dev.ckeditor.com/ticket/8016">#8016</a> : [WebKit] Flash content is not visible when previewing content.</li> 
     56                <li><a href="http://dev.ckeditor.com/ticket/6908">#6908</a> : Text color should always be applied to the linked text.</li> 
    5657                <li>Updated the following language files:<ul> 
    5758                        <li><a href="http://dev.ckeditor.com/ticket/8128">#8128</a> : Italian;</li> 
  • CKEditor/trunk/_source/plugins/colorbutton/plugin.js

    r7181 r7198  
    142142                                                        function( element ) 
    143143                                                        { 
    144                                                                 // Fore color style must be applied inside links instead of around it. 
    145                                                                 return element.getName() != 'a' || isUnstylable( element ); 
     144                                                                // Fore color style must be applied inside links instead of around it. (#4772,#6908) 
     145                                                                return !( element.is( 'a' ) || element.getElementsByTag( 'a' ).count() ) || isUnstylable( element ); 
    146146                                                        }; 
    147147 
Note: See TracChangeset for help on using the changeset viewer.
© 2003 – 2012 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy