Skip to content
This repository was archived by the owner on Jun 26, 2020. It is now read-only.

I/6049: Introduced the table cell properties UI #227

Merged
merged 38 commits into from
Jan 28, 2020
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
39d9228
First implementation of the cell properties form.
oleq Jan 13, 2020
1c236ce
Added some space to the table cell form. Attached the form to the edi…
oleq Jan 14, 2020
ab6f0cf
Code refactoring.
oleq Jan 14, 2020
b96df24
Used LabeledView in the cell properties form.
oleq Jan 14, 2020
9453c51
Code refactoring.
oleq Jan 15, 2020
afb59d0
Code refactoring and docs.
oleq Jan 15, 2020
b9f2c49
Moved alignment icons to ckeditor5-core. Updated paths to icons.
oleq Jan 15, 2020
176d8f7
Docs.
oleq Jan 15, 2020
df19000
Docs.
oleq Jan 15, 2020
128edef
Removed the obsolete TableStyleUI plugin.
oleq Jan 15, 2020
a86246a
Tests: Added TableCellPropertiesView tests. Code refactoring.
oleq Jan 17, 2020
268a598
Tests: Added tests for the FormRowView.
oleq Jan 17, 2020
e1b263f
Tests: Added TableCellPropertiesUI presence assertion to TableCellPro…
oleq Jan 17, 2020
158179d
Tests: Added tests for UI utils.
oleq Jan 17, 2020
19963df
Code refactoring.
oleq Jan 17, 2020
a19f0c9
Aligned cell properties UI to the latest UI framework API.
oleq Jan 20, 2020
b8461a9
Tests: Partial TableCellPropertiesUI tests.
oleq Jan 21, 2020
25573f4
Merge remote-tracking branch 'origin/i/3287' into i/6049
oleq Jan 21, 2020
f8689d9
Fixed wrong module paths.
oleq Jan 21, 2020
7be0348
Code refactoring.
oleq Jan 21, 2020
f165c95
Tests: Code refactoring.
oleq Jan 21, 2020
e4dfae1
Tests: Finished the TableCellPropertiesUI tests.
oleq Jan 21, 2020
3b139f0
Docs: Fixed broken module paths.
oleq Jan 21, 2020
6580667
Docs: Fixed broken links.
oleq Jan 21, 2020
85d0ce6
Docs: Improved TableCellPropertiesView docs.
oleq Jan 21, 2020
82dae2d
Tests: Aligned tests to the latest TableCellPropertiesView API.
oleq Jan 22, 2020
2aee83a
Added contexts.json entries for the table cell properties UI.
oleq Jan 22, 2020
782e3c5
Code refactoring.
oleq Jan 22, 2020
6bea932
Tests: Code refactoring.
oleq Jan 22, 2020
ca4661d
Merge remote-tracking branch 'origin/i/3287' into i/6049
oleq Jan 22, 2020
cecd9d6
Merge branch 'master' into i/6049
oleq Jan 24, 2020
c6e9716
Merge branch 'master' into i/6049
jodator Jan 27, 2020
ccc7e0c
Code refactoring in the TableCellPropertiesUI class.
oleq Jan 28, 2020
579f7ea
Code refactoring in the TableCellPropertiesUI class.
oleq Jan 28, 2020
08667fb
Update src/tablecellproperties/ui/tablecellpropertiesview.js
oleq Jan 28, 2020
1e9d558
Update src/tablecellproperties/ui/tablecellpropertiesview.js
oleq Jan 28, 2020
21f11d1
Update src/tablecellproperties/ui/tablecellpropertiesview.js
oleq Jan 28, 2020
10ab4ae
Merge branch 'master' into i/6049
oleq Jan 28, 2020
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
Prev Previous commit
Next Next commit
Aligned cell properties UI to the latest UI framework API.
  • Loading branch information
oleq committed Jan 20, 2020
commit a19f0c975a3fe575e75529621df995ad0482cfea
12 changes: 6 additions & 6 deletions src/ui/tablecellpropertiesview.js
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import FocusTracker from '@ckeditor/ckeditor5-utils/src/focustracker';
import FocusCycler from '@ckeditor/ckeditor5-ui/src/focuscycler';

import LabeledView from '@ckeditor/ckeditor5-ui/src/labeledview/labeledview';
import { labeledInputCreator, labeledDropdownCreator } from '@ckeditor/ckeditor5-ui/src/labeledview/creators';
import { createLabeledInputText, createLabeledDropdown } from '@ckeditor/ckeditor5-ui/src/labeledview/utils';
import LabelView from '@ckeditor/ckeditor5-ui/src/label/labelview';
import { addListToDropdown } from '@ckeditor/ckeditor5-ui/src/dropdown/utils';
import ToolbarView from '@ckeditor/ckeditor5-ui/src/toolbar/toolbarview';
@@ -330,7 +330,7 @@ export default class TableCellPropertiesView extends View {

// -- Style ---------------------------------------------------

const borderStyleDropdown = this.borderStyleDropdown = new LabeledView( locale, labeledDropdownCreator );
const borderStyleDropdown = this.borderStyleDropdown = new LabeledView( locale, createLabeledDropdown );
borderStyleDropdown.set( {
label: t( 'Style' ),
class: 'ck-table-cell-properties-form__border-style'
@@ -354,7 +354,7 @@ export default class TableCellPropertiesView extends View {

// -- Width ---------------------------------------------------

const borderWidthInput = this.borderWidthInput = new LabeledView( locale, labeledInputCreator );
const borderWidthInput = this.borderWidthInput = new LabeledView( locale, createLabeledInputText );

borderWidthInput.set( {
label: t( 'Width' ),
@@ -371,7 +371,7 @@ export default class TableCellPropertiesView extends View {

// -- Color ---------------------------------------------------

const borderColorInput = this.borderColorInput = new LabeledView( locale, labeledInputCreator );
const borderColorInput = this.borderColorInput = new LabeledView( locale, createLabeledInputText );
borderColorInput.label = t( 'Color' );
borderColorInput.view.bind( 'value' ).to( this, 'borderColor' );
borderColorInput.bind( 'isEnabled' ).to( this, 'borderStyle', value => {
@@ -393,7 +393,7 @@ export default class TableCellPropertiesView extends View {
_createBackgroundField() {
const locale = this.locale;
const t = this.t;
const backgroundInput = this.backgroundInput = new LabeledView( locale, labeledInputCreator );
const backgroundInput = this.backgroundInput = new LabeledView( locale, createLabeledInputText );

backgroundInput.set( {
label: t( 'Background' ),
@@ -416,7 +416,7 @@ export default class TableCellPropertiesView extends View {
_createPaddingField() {
const locale = this.locale;
const t = this.t;
const paddingInput = this.paddingInput = new LabeledView( locale, labeledInputCreator );
const paddingInput = this.paddingInput = new LabeledView( locale, createLabeledInputText );

paddingInput.set( {
label: t( 'Padding' ),