Merge branch 'master' into t/ckeditor5/1404

ckeditor · Aug 13, 2019 · e671572 · e671572
2 parents 8e94939 + 8cc3436
commit e671572
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/commands/mergecellcommand.js b/src/commands/mergecellcommand.js
@@ -114,7 +114,7 @@ export default class MergeCellCommand extends Command {
 	/**
 	 * Returns a cell that can be merged with the current cell depending on the command's direction.
 	 *
-	 * @returns {module:engine/model/element|undefined}
+	 * @returns {module:engine/model/element~Element|undefined}
 	 * @private
 	 */
 	_getMergeableCell() {

diff --git a/src/ui/inserttableview.js b/src/ui/inserttableview.js
@@ -59,7 +59,7 @@ export default class InsertTableView extends View {
 		 * @member {String} #label
 		 */
 		this.bind( 'label' )
-			.to( this, 'columns', this, 'rows', ( columns, rows ) => `${ rows } x ${ columns }` );
+			.to( this, 'columns', this, 'rows', ( columns, rows ) => `${ rows } × ${ columns }` );
 
 		this.setTemplate( {
 			tag: 'div',

diff --git a/tests/ui/inserttableview.js b/tests/ui/inserttableview.js
@@ -39,7 +39,7 @@ describe( 'InsertTableView', () => {
 		} );
 
 		it( 'sets #label to default rows & columns', () => {
-			expect( view.label ).to.equal( '0 x 0' );
+			expect( view.label ).to.equal( '0 × 0' );
 		} );
 
 		it( 'creates #element from template', () => {
@@ -85,11 +85,11 @@ describe( 'InsertTableView', () => {
 			it( 'binds #label to rows & columns', () => {
 				view.rows = 3;
 
-				expect( view.label ).to.equal( '3 x 0' );
+				expect( view.label ).to.equal( '3 × 0' );
 
 				view.columns = 7;
 
-				expect( view.label ).to.equal( '3 x 7' );
+				expect( view.label ).to.equal( '3 × 7' );
 			} );
 
 			it( 'mousedown event should be prevented', () => {