Forráskód Böngészése

Internal: Minor refactor to clean up the code. Remove stray parameters.

Marek Lewandowski 5 éve
szülő
commit
a7da3f61b7

+ 8 - 12
packages/ckeditor5-table/src/commands/removerowcommand.js

@@ -44,25 +44,19 @@ export default class RemoveRowCommand extends Command {
 		};
 		};
 		const firstCell = referenceCells[ 0 ];
 		const firstCell = referenceCells[ 0 ];
 		const table = firstCell.parent.parent;
 		const table = firstCell.parent.parent;
-
 		const tableMap = [ ...new TableWalker( table, { endRow: removedRowIndexes.last } ) ];
 		const tableMap = [ ...new TableWalker( table, { endRow: removedRowIndexes.last } ) ];
 
 
-		const firstCellData = tableMap.find( value => value.cell === firstCell );
-
-		const headingRows = table.getAttribute( 'headingRows' ) || 0;
-
-		const columnToFocus = firstCellData.column;
-
 		this.editor.model.change( writer => {
 		this.editor.model.change( writer => {
 			// Temporary workaround to avoid the "model-selection-range-intersects" error.
 			// Temporary workaround to avoid the "model-selection-range-intersects" error.
 			writer.setSelection( writer.createSelection( table, 'on' ) );
 			writer.setSelection( writer.createSelection( table, 'on' ) );
 
 
+			const firstCellData = tableMap.find( value => value.cell === firstCell );
+			const columnToFocus = firstCellData.column;
 			let cellToFocus;
 			let cellToFocus;
 
 
 			for ( let i = removedRowIndexes.last; i >= removedRowIndexes.first; i-- ) {
 			for ( let i = removedRowIndexes.last; i >= removedRowIndexes.first; i-- ) {
 				const removedRowIndex = i;
 				const removedRowIndex = i;
-				const tableRow = table.getChild( removedRowIndex );
-				this._removeRow( headingRows, removedRowIndex, table, writer, tableMap, tableRow );
+				this._removeRow( removedRowIndex, table, writer, tableMap );
 
 
 				cellToFocus = getCellToFocus( table, removedRowIndex, columnToFocus );
 				cellToFocus = getCellToFocus( table, removedRowIndex, columnToFocus );
 			}
 			}
@@ -74,13 +68,15 @@ export default class RemoveRowCommand extends Command {
 	/**
 	/**
 	 * @private
 	 * @private
 	 */
 	 */
-	_removeRow( headingRows, removedRowIndex, table, writer, tableMap, tableRow ) {
+	_removeRow( removedRowIndex, table, writer, tableMap ) {
+		const cellsToMove = new Map();
+		const tableRow = table.getChild( removedRowIndex );
+		const headingRows = table.getAttribute( 'headingRows' ) || 0;
+
 		if ( headingRows && removedRowIndex <= headingRows ) {
 		if ( headingRows && removedRowIndex <= headingRows ) {
 			updateNumericAttribute( 'headingRows', headingRows - 1, table, writer, 0 );
 			updateNumericAttribute( 'headingRows', headingRows - 1, table, writer, 0 );
 		}
 		}
 
 
-		const cellsToMove = new Map();
-
 		// Get cells from removed row that are spanned over multiple rows.
 		// Get cells from removed row that are spanned over multiple rows.
 		tableMap
 		tableMap
 			.filter( ( { row, rowspan } ) => row === removedRowIndex && rowspan > 1 )
 			.filter( ( { row, rowspan } ) => row === removedRowIndex && rowspan > 1 )