Skip to content

Commit

Permalink
TINY-9392: Forgot to add icon to custom colors. (#8286)
Browse files Browse the repository at this point in the history
* TINY-9392: Forgot to add icon to custom colors.

* TINY-9392: Updated tests, forgotten to do with first commit
  • Loading branch information
HAFRMO authored Nov 22, 2022
1 parent 659adfb commit 398a1f2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const getCurrentColors = (id: string): Menu.ChoiceMenuItemSpec[] =>
Arr.map(getCacheForId(id).state(), (color) => ({
type: 'choiceitem',
text: color,
icon: 'checkmark',
value: color
}));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ describe('browser.tinymce.themes.silver.editor.color.ColorCacheTest', () => {
{
type: 'choiceitem',
text: '#0F00F0',
icon: 'checkmark',
value: '#0F00F0'
}
];
Expand All @@ -39,18 +40,21 @@ describe('browser.tinymce.themes.silver.editor.color.ColorCacheTest', () => {
{
type: 'choiceitem',
text: '#0F00F0',
icon: 'checkmark',
value: '#0F00F0'
}
];
const expectedResultOther: Menu.ChoiceMenuItemSpec[] = [
{
type: 'choiceitem',
text: '#F0FF0F',
icon: 'checkmark',
value: '#F0FF0F'
},
{
type: 'choiceitem',
text: '#0F00F0',
icon: 'checkmark',
value: '#0F00F0'
}
];
Expand Down

0 comments on commit 398a1f2

Please sign in to comment.