Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.1.1
[ckeditor.git]
/
_source
/
plugins
/
colorbutton
/
plugin.js
diff --git
a/_source/plugins/colorbutton/plugin.js
b/_source/plugins/colorbutton/plugin.js
index
b49e5f8
..
f35ed2c
100644
(file)
--- a/
_source/plugins/colorbutton/plugin.js
+++ b/
_source/plugins/colorbutton/plugin.js
@@
-194,7
+194,13
@@
CKEDITOR.config.colorButton_foreStyle =
{
\r
element : 'span',
\r
styles : { 'color' : '#(color)' },
\r
{
\r
element : 'span',
\r
styles : { 'color' : '#(color)' },
\r
- overrides : [ { element : 'font', attributes : { 'color' : null } } ]
\r
+ overrides : [ { element : 'font', attributes : { 'color' : null } } ],
\r
+
\r
+ // Fore color style must be applied inside links instead of around it.
\r
+ childRule : function( element )
\r
+ {
\r
+ return element.getName() != 'a';
\r
+ }
\r
};
\r
\r
/**
\r
};
\r
\r
/**
\r