Changeset 7198

Timestamp:

08/12/11 17:59:06 (22 months ago)

Author:

garry.yao

Message:

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

Location:

CKEditor/trunk

Files:

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

CKEditor/trunk/CHANGES.html

@@ -54 +54 @@
                 <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>
                 <li><a href="http://dev.ckeditor.com/ticket/8016">#8016</a> : [WebKit] Flash content is not visible when previewing content.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/6908">#6908</a> : Text color should always be applied to the linked text.</li>
                 <li>Updated the following language files:<ul>
                         <li><a href="http://dev.ckeditor.com/ticket/8128">#8128</a> : Italian;</li>

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

@@ -142 +142 @@
                                                         function( element )
                                                         {
-                                                                // Fore color style must be applied inside links instead of around it.
-                                                                return element.getName() != 'a' || isUnstylable( element );
+                                                                // Fore color style must be applied inside links instead of around it. (#4772,#6908)
+                                                                return !( element.is( 'a' ) || element.getElementsByTag( 'a' ).count() ) || isUnstylable( element );
                                                         };