-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9555 from ckeditor/i/8502-ui
Feature (table): Support for the default table properties. Read more about [the feature in the documentation](https://ckeditor.com/docs/ckeditor5/latest/features/table.html). Closes #8502. Closes #9219. Fix (engine): The conversion upcast `elementToAttribute()` and `attributeToAttribute()` functions should not call the `model.value()` callback if the element will not be converted. Closes #9536. MINOR BREAKING CHANGE (table): Clases `TableAlignmentCommand`, `TableBackgroundColorCommand`, `TableBorderColorCommand`, `TableBorderStyleCommand`, `TableBorderWidthCommand`, `TableHeightCommand`, `TablePropertyCommand`, `TableWidthCommand` requires the second argument called `defaultValue` which is the default value for the command. MINOR BREAKING CHANGE (table): The `TablePropertiesView` class requires additional property in the object as the second constructor argument (`options.defaultTableProperties`).
- Loading branch information
Showing
42 changed files
with
1,751 additions
and
185 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
{ | ||
"Save": "Label for the Save button.", | ||
"Cancel": "Label for the Cancel button.", | ||
"Remove color": "The label used by a button next to the color palette in the color picker that removes the color (resets it to an empty value, example usages in font color or table properties)." | ||
"Remove color": "The label used by a button next to the color palette in the color picker that removes the color (resets it to an empty value, example usages in font color or table properties).", | ||
"Restore default": "The label used by a button next to the color palette in the color picker that restores the default value if the default table properties are specified." | ||
} |
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
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
2 changes: 1 addition & 1 deletion
2
packages/ckeditor5-paste-from-office/tests/_data/table/tablecellproperties/model.html
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
30 changes: 30 additions & 0 deletions
30
packages/ckeditor5-table/docs/_snippets/features/table-default-properties.html
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
<style id="table-default-properties-styles"> | ||
.table-default-properties-container .ck-content .table { | ||
float: right; | ||
width: 500px; | ||
height: 250px; | ||
} | ||
|
||
.table-default-properties-container .ck-content .table table { | ||
border-style: dashed; | ||
border-color: hsl(90, 75%, 60%); | ||
border-width: 3px; | ||
} | ||
</style> | ||
|
||
<div class="table-default-properties-container"> | ||
<div id="snippet-table-default-properties"> | ||
<figure class="table"> | ||
<table> | ||
<tr> | ||
<td>Cell number 1</td> | ||
<td>Cell number 2</td> | ||
</tr> | ||
<tr> | ||
<td>Cell number 3</td> | ||
<td>Cell number 4</td> | ||
</tr> | ||
</table> | ||
</figure> | ||
</div> | ||
</div> |
42 changes: 42 additions & 0 deletions
42
packages/ckeditor5-table/docs/_snippets/features/table-default-properties.js
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
/** | ||
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved. | ||
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license | ||
*/ | ||
|
||
/* globals ClassicEditor, CKEditorPlugins, console, window, document */ | ||
|
||
ClassicEditor | ||
.create( document.querySelector( '#snippet-table-default-properties' ), { | ||
extraPlugins: [ | ||
CKEditorPlugins.TableProperties, | ||
CKEditorPlugins.TableCellProperties | ||
], | ||
table: { | ||
contentToolbar: [ 'tableColumn', 'tableRow', 'mergeTableCells', 'tableProperties', 'tableCellProperties' ], | ||
tableProperties: { | ||
defaultProperties: { | ||
borderStyle: 'dashed', | ||
borderColor: 'hsl(90, 75%, 60%)', | ||
borderWidth: '3px', | ||
alignment: 'right', | ||
width: '500px', | ||
height: '250px' | ||
} | ||
} | ||
}, | ||
image: { | ||
toolbar: [ | ||
'imageStyle:full', | ||
'imageStyle:side', | ||
'|', | ||
'imageTextAlternative' | ||
] | ||
}, | ||
placeholder: 'Insert the new table with applied the default styles.' | ||
} ) | ||
.then( editor => { | ||
window.editorDefaultStyles = editor; | ||
} ) | ||
.catch( err => { | ||
console.error( err.stack ); | ||
} ); |
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
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
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
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
Oops, something went wrong.