Skip to content

Commit 02ea7b1

Browse files
committed
Removing duplicate code
1 parent f3a24c0 commit 02ea7b1

File tree

2 files changed

+9
-25
lines changed

2 files changed

+9
-25
lines changed

js/dataTables.checkboxes.js

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -537,21 +537,13 @@ Checkboxes.prototype = {
537537

538538
var cellSelector;
539539

540-
// Get cell
541-
var $cell = $(ctrl).closest('td');
542-
543-
// If cell is in a fixed column using FixedColumns extension
544-
if($cell.parents('.DTFC_Cloned').length){
545-
cellSelector = dt.fixedColumns().cellIndex($cell);
546-
547-
} else {
548-
cellSelector = $cell;
549-
}
550-
551-
var cell = dt.cell(cellSelector);
552-
var cellIdx = cell.index();
540+
// Get cell and column index
541+
var cellIdx = this.getCellIndex($(ctrl).closest('td'));
553542
var colIdx = cellIdx.column;
554543

544+
// Get cell
545+
var cell = dt.cell(cellIdx);
546+
555547
// If row selection is not enabled
556548
// NOTE: if row selection is enabled, checkbox selection/deselection
557549
// would be handled by onSelect event instead
@@ -628,17 +620,9 @@ Checkboxes.prototype = {
628620
var dt = self.s.dt;
629621
var ctx = self.s.ctx;
630622

631-
// Calculate column index
632-
var colIdx = null;
633-
var $th = $(ctrl).closest('th');
634-
635-
// If column is fixed using FixedColumns extension
636-
if($th.parents('.DTFC_Cloned').length){
637-
var cellIdx = dt.fixedColumns().cellIndex($th);
638-
colIdx = cellIdx.column;
639-
} else {
640-
colIdx = dt.column($th).index();
641-
}
623+
// Get cell and column index
624+
var cellIdx = this.getCellIndex($(ctrl).closest('th'));
625+
var colIdx = cellIdx.column;
642626

643627
dt.column(colIdx, {
644628
page: (

0 commit comments

Comments
 (0)