Skip to content

Commit df55687

Browse files
committed
Reverting back last commit
1 parent e7d5cda commit df55687

File tree

3 files changed

+30
-14
lines changed

3 files changed

+30
-14
lines changed

js/dataTables.checkboxes.js

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
/*! Checkboxes 1.2.1
1+
/*! Checkboxes 1.2.2
22
* Copyright (c) Gyrocode (www.gyrocode.com)
33
* License: MIT License
44
*/
55

66
/**
77
* @summary Checkboxes
88
* @description Checkboxes extension for jQuery DataTables
9-
* @version 1.2.1
9+
* @version 1.2.2
1010
* @file dataTables.checkboxes.js
1111
* @author Gyrocode (http://www.gyrocode.com/projects/jquery-datatables-checkboxes/)
1212
* @contact http://www.gyrocode.com/contacts
@@ -537,12 +537,20 @@ Checkboxes.prototype = {
537537

538538
var cellSelector;
539539

540-
// Get cell and column index
541-
var cellIdx = this.getCellIndex($(ctrl).closest('td'));
542-
var colIdx = cellIdx.column;
543-
544540
// Get cell
545-
var cell = dt.cell(cellIdx);
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();
553+
var colIdx = cellIdx.column;
546554

547555
// If row selection is not enabled
548556
// NOTE: if row selection is enabled, checkbox selection/deselection
@@ -620,9 +628,17 @@ Checkboxes.prototype = {
620628
var dt = self.s.dt;
621629
var ctx = self.s.ctx;
622630

623-
// Get cell and column index
624-
var cellIdx = this.getCellIndex($(ctrl).closest('th'));
625-
var colIdx = cellIdx.column;
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+
}
626642

627643
dt.column(colIdx, {
628644
page: (
@@ -987,7 +1003,7 @@ Api.registerPlural( 'columns().checkboxes.selected()', 'column().checkboxes.sele
9871003
* @name Checkboxes.version
9881004
* @static
9891005
*/
990-
Checkboxes.version = '1.2.1';
1006+
Checkboxes.version = '1.2.2';
9911007

9921008

9931009

0 commit comments

Comments
 (0)