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 i/6114
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Feb 28, 2020
2 parents fe2b7a0 + ffe7df6 commit 466bc7d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/tablecellproperties/commands/tablecellpropertycommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ export default class TableCellPropertyCommand extends Command {
}

// Returns all selected table cells.
// The implementation of this function is incorrect as it may return a single cell twice.
// See https://github.com/ckeditor/ckeditor5/issues/6358.
function getSelectedTableCells( model ) {
const selection = model.document.selection;

Expand Down
1 change: 1 addition & 0 deletions src/tableselection.js
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ export default class TableSelection extends Plugin {
* @returns {Iterable.<module:engine/model/element~Element>}
*/
* getSelectedTableCells() {
// TODO: this function should be removed. See https://github.com/ckeditor/ckeditor5/issues/6358
if ( !this.hasMultiCellSelection ) {
return;
}
Expand Down
1 change: 1 addition & 0 deletions src/ui/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ export function getBalloonTablePositionData( editor ) {
* @returns {module:utils/dom/position~Options}
*/
export function getBalloonCellPositionData( editor ) {
// This is a bit naive. See https://github.com/ckeditor/ckeditor5/issues/6357.
const modelTableCell = getTableCellAtPosition( editor.model.document.selection.getFirstPosition() );
const viewTableCell = editor.editing.mapper.toViewElement( modelTableCell );

Expand Down

0 comments on commit 466bc7d

Please sign in to comment.