浏览代码

Internal: Refactored `SetHeaderColumnCommand#execute()` and `SetHeaderRowCommand#execute()` to use `#value` for simpler code.

Szymon Cofalik 6 年之前
父节点
当前提交
f688e82ff9

+ 2 - 3
packages/ckeditor5-table/src/commands/setheadercolumncommand.js

@@ -75,14 +75,13 @@ export default class SetHeaderColumnCommand extends Command {
 		const tableRow = tableCell.parent;
 		const table = tableRow.parent;
 
-		const currentHeadingColumns = parseInt( table.getAttribute( 'headingColumns' ) || 0 );
 		const { column: selectionColumn } = tableUtils.getCellLocation( tableCell );
 
-		if ( forceValue && currentHeadingColumns > selectionColumn || forceValue === false && currentHeadingColumns <= selectionColumn ) {
+		if ( forceValue === this.value ) {
 			return;
 		}
 
-		const headingColumnsToSet = currentHeadingColumns > selectionColumn ? selectionColumn : selectionColumn + 1;
+		const headingColumnsToSet = this.value ? selectionColumn : selectionColumn + 1;
 
 		model.change( writer => {
 			updateNumericAttribute( 'headingColumns', headingColumnsToSet, table, writer, 0 );

+ 2 - 2
packages/ckeditor5-table/src/commands/setheaderrowcommand.js

@@ -76,11 +76,11 @@ export default class SetHeaderRowCommand extends Command {
 		const currentHeadingRows = table.getAttribute( 'headingRows' ) || 0;
 		const selectionRow = tableRow.index;
 
-		if ( forceValue && currentHeadingRows > selectionRow || forceValue === false && currentHeadingRows <= selectionRow ) {
+		if ( forceValue === this.value ) {
 			return;
 		}
 
-		const headingRowsToSet = currentHeadingRows > selectionRow ? selectionRow : selectionRow + 1;
+		const headingRowsToSet = this.value ? selectionRow : selectionRow + 1;
 
 		model.change( writer => {
 			if ( headingRowsToSet ) {