Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Font color and font background color throw error while having buttons in the main toolbar and the balloon toolbar #15658

Merged
merged 10 commits into from
Jan 19, 2024
Merged

Font color and font background color throw error while having buttons in the main toolbar and the balloon toolbar #15658

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5567ac1
Fix implementation.
illia-stv Jan 8, 2024
286ffdb
Add manual test.
illia-stv Jan 9, 2024
8e06929
Code review fixes.
illia-stv Jan 12, 2024
2483a76
Merge branch 'master' into ck/15580-font-color-and-font-background-co…
illia-stv Jan 15, 2024
4c41dd5
Code reivew fixes.
illia-stv Jan 15, 2024
6dfb77b
Rename test.
illia-stv Jan 15, 2024
85cfa76
Fix license header.
illia-stv Jan 15, 2024
2a7ded5
Remove redundant testColor from toolbar in test.
illia-stv Jan 15, 2024
78293a4
Code review fixes.
illia-stv Jan 15, 2024
a97f3c8
Merge branch 'master' into ck/15580-font-color-and-font-background-co…
pszczesniak Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/ckeditor5-ui/src/colorselector/colorgridsfragmentview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,12 @@ export default class ColorGridsFragmentView extends View {
*/
public updateSelectedColors(): void {
const documentColorsGrid = this.documentColorsGrid;
const staticColorsGrid = this.staticColorsGrid!;
const staticColorsGrid = this.staticColorsGrid;
const selectedColor = this.selectedColor;

staticColorsGrid.selectedColor = selectedColor;
if ( staticColorsGrid ) {
staticColorsGrid.selectedColor = selectedColor;
}

if ( documentColorsGrid ) {
documentColorsGrid.selectedColor = selectedColor;
Expand Down
9 changes: 9 additions & 0 deletions packages/ckeditor5-ui/tests/colorselector/colorselectorview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,15 @@ describe( 'ColorSelectorView', () => {
sinon.assert.calledOnce( spy );
} );

it( 'should call updateSelectedColors when color grid is not defined without errors', () => {
const spy = sinon.spy( colorSelectorView, 'updateSelectedColors' );

colorSelectorView.colorGridsFragmentView.staticColorsGrid = null;
colorSelectorView.updateSelectedColors();

sinon.assert.calledOnce( spy );
} );

it( 'should unset selected color', () => {
setModelData( model,
'<paragraph><$text testColor="gold">Bar</$text></paragraph>' +
Expand Down