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

Commit

Permalink
Merge branch 'master' into t/ckeditor5/1554
Browse files Browse the repository at this point in the history
# Conflicts:
#	tests/converters/tablecell-post-fixer.js
  • Loading branch information
jodator committed May 21, 2019
2 parents c676a57 + afdd17c commit 11bf88c
Show file tree
Hide file tree
Showing 66 changed files with 393 additions and 209 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

/* eslint-env node */
Expand Down
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
sudo: required
dist: trusty
addons:
chrome: stable
firefox: latest
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
language: node_js
cache:
yarn: true
Expand All @@ -16,6 +12,7 @@ branches:
except:
- stable
before_install:
- export START_TIME=$( date +%s )
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- npm i -g yarn
Expand All @@ -26,7 +23,11 @@ script:
- ckeditor5-dev-tests-travis
after_success:
- ckeditor5-dev-tests-save-revision
after_script:
- export END_TIME=$( date +%s )
- ckeditor5-dev-tests-notify-travis-status
env:
global:
- secure: BKC/208PtT8ya6P0gNbEczGvd5UCtvIljxjQokFrFESOAUmqtlmdUjES/MRCEyGn3hEi9cYLPFaiAH68qjl+F1uLSwcqvalTnXMPpUPUjGODHKze+P1BGyP6KjvsTO+Lw0exwisYLChkhkQhXN7uUehxg6pdZ85r4uS3XKeCkVdObC/OPnlEgB2IDULDHnR3EApOR+4vqU1+ci8+12/ct62EPgq8bbxirvk6xoelNJeLVBBgySdC2ltPNVmERq9OqWJfl6zv9y+NbgFcbYNNdvMFgm1WSlf1HzATTNYbpmXz3pf2kSRjy4ikoIlq7qZ3igLJpGrWPQFttmnpxh/kuapSEHX74LqlUi9ctHX4/gO9+NdCriXSERYQXkVO4beHfqfR5S1dADBXHfBJGGxEmDjkAdrWA9ATG4sOD8sX/qZOFI86NsVYnglbAbHfdjLhQVPjqQ+596nSi/C2sZEOtvnNFT6ZkEeQ10aLp1lWJOn79226sVkC6eAIlVlypME9M+C1DLyGIdXzxcc0+nunVF7cMwTXhwW0psToLASuHJjYJ0/X4uzpxLIaGVFQ0PJE5ALtO1HDZqUrPrJSOkYXcZnbDk8FYpkeAvqNbHKUOUWUtVfmtrzvBDGoZrSfgnLI7WfNYUtfuZ0FcCaB5RV4H3iHBcjqhbkBJrcUe7TNPdo=
- secure: XbRykrpv5bv7Pu7NNRtAvAJr+MZRTBC+/aHGzW06gzu4msi+yifK3AnE0FvOfMsBaiLMXSoxVyUJwRZmSPa7wXt4ZgUna9Ntbx1I7JxjjbbB3K+lUHY+9r+kGFHDpEYQIMqkrSSUeP2kE/rHn6aLAd+bFsrs1/FyxMefSOE4egYAmYYe7V2LfTFX2/M2QfyYa5lJopJYgil/OzTd5kHr3rqQF4h/2Ld2MuVNsjuob0tJLBlIgdAuOm4mKEnPwyIMRWrQDwPs3DBTIiPBtLJO+/Cd/e7i97M8SscFBtFwg+hisUhzj57ixwJb0IANtOZewsqqmtCNt6JJyWFYH4rvqUWQkeCqOI+Gbi0LI/+RLaTBHVzSFIJFdt/zujNiEUDMzR5pCgNqc9ckmmqriwaURw4EuSUqnYoFc0xp95GKOTbAd6+UZOBfub3aNJBmMCuC2VpGv7RYxrzvOmWljWd5S2E0ZePafYFAiPK5rB5725ah1SohgOr6iQh/7yFSEwqLpXIZSBjkKLd2sLyILjywXxk11aUMPlKgLULVoN5jSpiVbw+j+bDZuNuf7AVSHymPGxBzpkkHu6wsXAqzKUZ0XHVpFSxCmAY74vj+3khRgweO8MQYG61GxWV8lWJK5COFUVfHcHeT5sRZCgq06hHQE5NKKHzukBO3cCeola2D6wU=
- secure: MTHJ5n94Ussk/u/YmIdBHsIDRan64VCbZRTklkx9hgtqwXcj+j6jV6S8makAZSCR55iBrscX1nrjROxSM4fbUsy4Owcu2Fik17IgA+xkYk2HgT2aupzLbpBD3DB538tHBxOb7me6m0GiO9Q9T3a2M8wBA4opxFfJX5O5qIy7lkKRnohy/ekGq2Av5cSU54tu0advGLA0okicE8qpkbpkV+DyZsPKYuHtOccJU/KJjX0dAH4/SWRqOeaXqRaOR6i8RcKEn4yEvKvZgqncv6hrzW4rJk1eXHFQCWlMnjIAQvIcpq0cplu5ktHjQ1W7/pTOELTnRLA4j+Oiu5+jZZqWKqTtNiZpATIp/fiDUTODrSIPovPbXZK0PepJhP3inWp2FtXTTj2/NrRtS2fL+U0jsI0wYBBx2WTDbj537BXFHAIRqKUDaEVxSzUGelA4H9STBNWbDXmyTeYzchWpimj/6TwG/VRYjhNQZ1rcwaGKpxNd8VDmDf2QxHcnfAu6+irsJb/0+B8zOj6hzw2ouLSlgEjfv9U5x997jeIUiStQBpdKrNiRw878tOuE0yOGbjIhfkKdo4gmcvDi20RioOs8qiO/tfYjgV/43sMBasrkNVkvv+RITTxUNf5kpWq6UnI8X5VjzWUDAKwELj6kPZl1C6MG0p8Fl8du2F77rnJS2wI=
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
Changelog
=========

## [12.0.1](https://github.com/ckeditor/ckeditor5-table/compare/v12.0.0...v12.0.1) (2019-04-10)

### Bug fixes

* Single paragraphs with attributes inside `<tableCell>` will be properly converted in the data pipeline. Closes [ckeditor/ckeditor5#1620](https://github.com/ckeditor/ckeditor5/issues/1620). ([67ec89f](https://github.com/ckeditor/ckeditor5-table/commit/67ec89f))

### Other changes

* Optimized icons. ([c042369](https://github.com/ckeditor/ckeditor5-table/commit/c042369))
* Updated translations. ([cd204c3](https://github.com/ckeditor/ckeditor5-table/commit/cd204c3))


## [12.0.0](https://github.com/ckeditor/ckeditor5-table/compare/v11.0.1...v12.0.0) (2019-02-28)

### Features
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/features/build-table-source.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

/* globals window */
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/features/table.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

/* globals ClassicEditor, console, window, document */
Expand Down
32 changes: 17 additions & 15 deletions docs/features/table.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,21 +159,23 @@ The {@link module:table/table~Table} plugin registers the following UI component

And the following commands:

* The `'insertTable'` command implemented by {@link module:table/commands/inserttablecommand~InsertTableCommand}.
* The `'insertTableColumnLeft'` command implemented by {@link module:table/commands/insertcolumncommand~InsertColumnCommand}.
* The `'insertTableColumnRight'` command implemented by {@link module:table/commands/insertcolumncommand~InsertColumnCommand}.
* The `'insertTableRowAbove'` command implemented by {@link module:table/commands/insertrowcommand~InsertRowCommand}.
* The `'insertTableRowBelow'` command implemented by {@link module:table/commands/insertrowcommand~InsertRowCommand}.
* The `'removeTableColumn'` command implemented by {@link module:table/commands/removecolumncommand~RemoveColumnCommand}.
* The `'removeTableRow'` command implemented by {@link module:table/commands/removerowcommand~RemoveRowCommand}.
* The `'setTableColumnHeader'` command implemented by {@link module:table/commands/setheadercolumncommand~SetHeaderColumnCommand}.
* The `'setTableRowHeader'` command implemented by {@link module:table/commands/setheaderrowcommand~SetHeaderRowCommand}.
* The `'mergeTableCellRight'` command implemented by {@link module:table/commands/mergecellcommand~MergeCellCommand}.
* The `'mergeTableCellLeft'` command implemented by {@link module:table/commands/mergecellcommand~MergeCellCommand}.
* The `'mergeTableCellUp'` command implemented by {@link module:table/commands/mergecellcommand~MergeCellCommand}.
* The `'mergeTableCellDown'` command implemented by {@link module:table/commands/mergecellcommand~MergeCellCommand}.
* The `'splitTableCellVertically'` command implemented by {@link module:table/commands/splitcellcommand~SplitCellCommand}.
* The `'splitTableCellHorizontally'` command implemented by {@link module:table/commands/splitcellcommand~SplitCellCommand}.
| {@link framework/guides/architecture/core-editor-architecture#commands Command} name | Implemented by |
|----------------------------------|-----------------------------------------------------------------------------|
| `'insertTable'` | {@link module:table/commands/inserttablecommand~InsertTableCommand} |
| `'insertTableColumnLeft'` | {@link module:table/commands/insertcolumncommand~InsertColumnCommand} |
| `'insertTableColumnRight'` | {@link module:table/commands/insertcolumncommand~InsertColumnCommand} |
| `'insertTableRowAbove'` | {@link module:table/commands/insertrowcommand~InsertRowCommand} |
| `'insertTableRowBelow'` | {@link module:table/commands/insertrowcommand~InsertRowCommand} |
| `'removeTableColumn'` | {@link module:table/commands/removecolumncommand~RemoveColumnCommand} |
| `'removeTableRow'` | {@link module:table/commands/removerowcommand~RemoveRowCommand} |
| `'setTableColumnHeader'` | {@link module:table/commands/setheadercolumncommand~SetHeaderColumnCommand} |
| `'setTableRowHeader'` | {@link module:table/commands/setheaderrowcommand~SetHeaderRowCommand} |
| `'mergeTableCellRight'` | {@link module:table/commands/mergecellcommand~MergeCellCommand} |
| `'mergeTableCellLeft'` | {@link module:table/commands/mergecellcommand~MergeCellCommand} |
| `'mergeTableCellUp'` | {@link module:table/commands/mergecellcommand~MergeCellCommand} |
| `'mergeTableCellDown'` | {@link module:table/commands/mergecellcommand~MergeCellCommand} |
| `'splitTableCellVertically'` | {@link module:table/commands/splitcellcommand~SplitCellCommand} |
| `'splitTableCellHorizontally'` | {@link module:table/commands/splitcellcommand~SplitCellCommand} |

The {@link module:table/tabletoolbar~TableToolbar} plugin introduces two balloon toolbars for tables.
* The content toolbar shows up when table cell is selected and is anchored to the table. It is possible to {@link module:table/table~TableConfig#contentToolbar configure} its content. Normally, it contains the table-related tools such as `'tableColumn'`, `'tableRow'`, and `'mergeTableCells'` dropdowns.
Expand Down
89 changes: 89 additions & 0 deletions lang/translations/es.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
# Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
#
# !!! IMPORTANT !!!
#
# Before you edit this file, please keep in mind that contributing to the project
# translations is possible ONLY via the Transifex online service.
#
# To submit your translations, visit https://www.transifex.com/ckeditor/ckeditor5.
#
# To learn more, check out the official contributor's guide:
# https://ckeditor.com/docs/ckeditor5/latest/framework/guides/contributing/contributing.html
#
msgid ""
msgstr ""
"Language-Team: Spanish (https://www.transifex.com/ckeditor/teams/11143/es/)\n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

msgctxt "Label for the insert table toolbar button."
msgid "Insert table"
msgstr "Insertar tabla"

msgctxt "Label for the set/unset table header column button."
msgid "Header column"
msgstr "Columna de encabezado"

msgctxt "Label for the insert table column to the left of the current one button."
msgid "Insert column left"
msgstr "Insertar columna izquierda"

msgctxt "Label for the insert table column to the right of the current one button."
msgid "Insert column right"
msgstr "Insertar columna derecha"

msgctxt "Label for the delete table column button."
msgid "Delete column"
msgstr "Eliminar columna"

msgctxt "Label for the table column dropdown button."
msgid "Column"
msgstr "Columna"

msgctxt "Label for the set/unset table header row button."
msgid "Header row"
msgstr "Fila de encabezado"

msgctxt "Label for the insert row below button."
msgid "Insert row below"
msgstr "Insertar fila debajo"

msgctxt "Label for the insert row above button."
msgid "Insert row above"
msgstr "Insertar fila encima"

msgctxt "Label for the delete table row button."
msgid "Delete row"
msgstr "Eliminar fila"

msgctxt "Label for the table row dropdown button."
msgid "Row"
msgstr "Fila"

msgctxt "Label for the merge table cell up button."
msgid "Merge cell up"
msgstr "Combinar celda superior"

msgctxt "Label for the merge table cell right button."
msgid "Merge cell right"
msgstr "Combinar celda derecha"

msgctxt "Label for the merge table cell down button."
msgid "Merge cell down"
msgstr "Combinar celda inferior"

msgctxt "Label for the merge table cell left button."
msgid "Merge cell left"
msgstr "Combinar celda izquierda"

msgctxt "Label for the split table cell vertically button."
msgid "Split cell vertically"
msgstr "Dividir celdas verticalmente"

msgctxt "Label for the split table cell horizontally button."
msgid "Split cell horizontally"
msgstr "Dividir celdas horizontalmente"

msgctxt "Label for the merge table cells button."
msgid "Merge cells"
msgstr "Combinar celdas"
89 changes: 89 additions & 0 deletions lang/translations/id.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
# Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
#
# !!! IMPORTANT !!!
#
# Before you edit this file, please keep in mind that contributing to the project
# translations is possible ONLY via the Transifex online service.
#
# To submit your translations, visit https://www.transifex.com/ckeditor/ckeditor5.
#
# To learn more, check out the official contributor's guide:
# https://ckeditor.com/docs/ckeditor5/latest/framework/guides/contributing/contributing.html
#
msgid ""
msgstr ""
"Language-Team: Indonesian (https://www.transifex.com/ckeditor/teams/11143/id/)\n"
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"

msgctxt "Label for the insert table toolbar button."
msgid "Insert table"
msgstr "Sisipkan tabel"

msgctxt "Label for the set/unset table header column button."
msgid "Header column"
msgstr "Kolom tajuk"

msgctxt "Label for the insert table column to the left of the current one button."
msgid "Insert column left"
msgstr "Sisipkan kolom ke kiri"

msgctxt "Label for the insert table column to the right of the current one button."
msgid "Insert column right"
msgstr "Sisipkan kolom ke kanan"

msgctxt "Label for the delete table column button."
msgid "Delete column"
msgstr "Hapus kolom"

msgctxt "Label for the table column dropdown button."
msgid "Column"
msgstr "Kolom"

msgctxt "Label for the set/unset table header row button."
msgid "Header row"
msgstr "Baris tajuk"

msgctxt "Label for the insert row below button."
msgid "Insert row below"
msgstr "Sisipkan baris ke bawah"

msgctxt "Label for the insert row above button."
msgid "Insert row above"
msgstr "Sisipkan baris ke atas"

msgctxt "Label for the delete table row button."
msgid "Delete row"
msgstr "Hapus baris"

msgctxt "Label for the table row dropdown button."
msgid "Row"
msgstr "Baris"

msgctxt "Label for the merge table cell up button."
msgid "Merge cell up"
msgstr "Gabungkan sel ke atas"

msgctxt "Label for the merge table cell right button."
msgid "Merge cell right"
msgstr "Gabungkan sel ke kanan"

msgctxt "Label for the merge table cell down button."
msgid "Merge cell down"
msgstr "Gabungkan sel ke bawah"

msgctxt "Label for the merge table cell left button."
msgid "Merge cell left"
msgstr "Gabungkan sel ke kiri"

msgctxt "Label for the split table cell vertically button."
msgid "Split cell vertically"
msgstr "Bagikan sel secara vertikal"

msgctxt "Label for the split table cell horizontally button."
msgid "Split cell horizontally"
msgstr "Bagikan sel secara horizontal"

msgctxt "Label for the merge table cells button."
msgid "Merge cells"
msgstr "Gabungkan sel"
2 changes: 1 addition & 1 deletion lang/translations/sr-latn.po
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
msgid ""
msgstr ""
"Language-Team: Serbian (Latin) (https://www.transifex.com/ckeditor/teams/11143/sr%40latin/)\n"
"Language-Team: Serbian (Latin) (https://www.transifex.com/ckeditor/teams/11143/sr@latin/)\n"
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

Expand Down
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ckeditor/ckeditor5-table",
"version": "12.0.0",
"version": "12.0.1",
"description": "Table feature for CKEditor 5.",
"keywords": [
"ckeditor",
Expand All @@ -10,23 +10,23 @@
"ckeditor5-plugin"
],
"dependencies": {
"@ckeditor/ckeditor5-core": "^12.0.0",
"@ckeditor/ckeditor5-ui": "^12.0.0",
"@ckeditor/ckeditor5-widget": "^11.0.0"
"@ckeditor/ckeditor5-core": "^12.1.0",
"@ckeditor/ckeditor5-ui": "^12.1.0",
"@ckeditor/ckeditor5-widget": "^11.0.1"
},
"devDependencies": {
"@ckeditor/ckeditor5-alignment": "^11.0.0",
"@ckeditor/ckeditor5-block-quote": "^11.0.0",
"@ckeditor/ckeditor5-clipboard": "^11.0.0",
"@ckeditor/ckeditor5-editor-classic": "^12.0.0",
"@ckeditor/ckeditor5-engine": "^13.0.0",
"@ckeditor/ckeditor5-image": "^13.0.0",
"@ckeditor/ckeditor5-list": "^12.0.0",
"@ckeditor/ckeditor5-media-embed": "^11.0.0",
"@ckeditor/ckeditor5-paragraph": "^11.0.0",
"@ckeditor/ckeditor5-typing": "^12.0.0",
"@ckeditor/ckeditor5-undo": "^11.0.0",
"@ckeditor/ckeditor5-utils": "^12.0.0",
"@ckeditor/ckeditor5-alignment": "^11.1.0",
"@ckeditor/ckeditor5-block-quote": "^11.0.1",
"@ckeditor/ckeditor5-clipboard": "^11.0.1",
"@ckeditor/ckeditor5-editor-classic": "^12.1.0",
"@ckeditor/ckeditor5-engine": "^13.1.0",
"@ckeditor/ckeditor5-image": "^13.0.1",
"@ckeditor/ckeditor5-list": "^12.0.1",
"@ckeditor/ckeditor5-media-embed": "^11.1.0",
"@ckeditor/ckeditor5-paragraph": "^11.0.1",
"@ckeditor/ckeditor5-typing": "^12.0.1",
"@ckeditor/ckeditor5-undo": "^11.0.1",
"@ckeditor/ckeditor5-utils": "^12.1.0",
"eslint": "^5.5.0",
"eslint-config-ckeditor5": "^1.0.11",
"husky": "^1.3.1",
Expand Down
2 changes: 1 addition & 1 deletion src/commands/insertcolumncommand.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion src/commands/insertrowcommand.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion src/commands/inserttablecommand.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion src/commands/mergecellcommand.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion src/commands/removecolumncommand.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion src/commands/removerowcommand.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

/**
Expand Down
Loading

0 comments on commit 11bf88c

Please sign in to comment.