Fix for: Custom colors added to colorButton_colors in form label/code don't work correctly
#2646
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comandeer
requested changes
Dec 5, 2018
|
|
||
| <script> | ||
| CKEDITOR.replace( 'editor', { | ||
| colorButton_colors: 'Not blue/F00,00F' |
There was a problem hiding this comment.
Maybe restrict toolbar to only one colorbutton? ATM there are two buttons: for background and text.
plugins/colorbutton/plugin.js
Outdated
| @@ -283,8 +282,8 @@ CKEDITOR.plugins.add( 'colorbutton', { | |||
| output.push( '<td>' + | |||
| '<a class="cke_colorbox" _cke_focus=1 hidefocus=true' + | |||
| ' title="', colorLabel, '"' + | |||
| ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'', colorName, '\',\'', type, '\'); return false;"' + | |||
| ' href="javascript:void(\'', colorLabel, '\')"' + | |||
| ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'#', colorCode, '\',\'', type, '\'); return false;"' + | |||
There was a problem hiding this comment.
IMO normalization of the color should be done inside clickFn.
CHANGES.md
Outdated
| @@ -6,6 +6,7 @@ | |||
| Fixed Issues: | |||
|
|
|||
| * [#1986](https://github.com/ckeditor/ckeditor-dev/issues/1986): Fixed: Cell Properties dialog from [Table Tools](https://ckeditor.com/cke4/addon/tabletools) plugin shows styles that are not allowed through [`config.allowedContent`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-allowedContent). | |||
| * [#1478](https://github.com/ckeditor/ckeditor-dev/issues/1478): Fixed: Custom colors added to [Color Button](https://ckeditor.com/cke4/addon/colorbutton) via `colorButton_colors` in form label/code don't work correctly. | |||
There was a problem hiding this comment.
Config variable can be linked.
engineering-this
force-pushed
the
t/1478
branch
from
bb73fbb to
5b7d1c1
Compare
|
I've added |
Comandeer
requested changes
Dec 10, 2018
Comandeer
requested changes
Dec 31, 2018
engineering-this
force-pushed
the
t/1478
branch
from
709e7b3 to
4d0a7da
Compare
|
Updated docs, and rebased branch. |
Comandeer
requested changes
Feb 4, 2019
engineering-this
force-pushed
the
t/1478
branch
from
4d0a7da to
aa7429c
Compare
|
Rebased, updated version references. |
…on't work correctly.
…sn't affect color set by color dialog.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is the purpose of this pull request?
Does your PR contain necessary tests?
All patches which change the editor code must include tests. You can always read more
on PR testing,
how to set the testing environment and
how to create tests
in the official CKEditor documentation.
This PR contains
What changes did you make?
Forced plugin to set
colorCodeinstead ofcolorNameon text.Reason behind this change can be found here: #1478 (comment)
Closes #1478