Skip to content

Commit

Permalink
85939d6c313f3f0306772073bb87e2a1e5ac9eb9
Browse files Browse the repository at this point in the history
Sync to source repo @85939d6c313f3f0306772073bb87e2a1e5ac9eb9
  • Loading branch information
Allan Jardine committed Nov 4, 2022
1 parent c7e4bdd commit 75192e8
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 24 deletions.
5 changes: 3 additions & 2 deletions datatables.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"types/types.d.ts"
],
"src-repo": "http://github.com/DataTables/DataTablesSrc",
"last-tag": "1.12.1"
}
"last-tag": "1.12.1",
"last-sync": "85939d6c313f3f0306772073bb87e2a1e5ac9eb9"
}
18 changes: 12 additions & 6 deletions js/jquery.dataTables.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*! DataTables 1.12.1
/*! DataTables 1.13.0
* ©2008-2022 SpryMedia Ltd - datatables.net/license
*/

/**
* @summary DataTables
* @description Paginate, search and order HTML tables
* @version 1.12.1
* @version 1.13.0
* @author SpryMedia Ltd
* @contact www.datatables.net
* @copyright SpryMedia Ltd.
Expand Down Expand Up @@ -3313,10 +3313,16 @@

for ( i=0, ien=cells.length ; i<ien ; i++ ) {
column = columns[i];
column.nTf = cells[i].cell;

if ( column.sClass ) {
$(column.nTf).addClass( column.sClass );
if (column) {
column.nTf = cells[i].cell;

if ( column.sClass ) {
$(column.nTf).addClass( column.sClass );
}
}
else {
_fnLog( oSettings, 0, 'Incorrect column count', 18 );
}
}
}
Expand Down Expand Up @@ -9679,7 +9685,7 @@
* @type string
* @default Version number
*/
DataTable.version = "1.12.1";
DataTable.version = "1.13.0";

/**
* Private data store, containing all of the settings objects that are
Expand Down
5 changes: 4 additions & 1 deletion js/jquery.dataTables.min.js

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion js/jquery.dataTables.min.mjs

Large diffs are not rendered by default.

16 changes: 11 additions & 5 deletions js/jquery.dataTables.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! DataTables 1.12.1
/*! DataTables 1.13.0
* ©2008-2022 SpryMedia Ltd - datatables.net/license
*/

Expand Down Expand Up @@ -3263,10 +3263,16 @@ function _fnBuildHead( oSettings )

for ( i=0, ien=cells.length ; i<ien ; i++ ) {
column = columns[i];
column.nTf = cells[i].cell;

if ( column.sClass ) {
$(column.nTf).addClass( column.sClass );
if (column) {
column.nTf = cells[i].cell;

if ( column.sClass ) {
$(column.nTf).addClass( column.sClass );
}
}
else {
_fnLog( oSettings, 0, 'Incorrect column count', 18 );
}
}
}
Expand Down Expand Up @@ -9629,7 +9635,7 @@ _api_register( 'i18n()', function ( token, def, plural ) {
* @type string
* @default Version number
*/
DataTable.version = "1.12.1";
DataTable.version = "1.13.0";

/**
* Private data store, containing all of the settings objects that are
Expand Down
18 changes: 9 additions & 9 deletions types/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,38 +16,38 @@
// No publicly documented properties
type InternalSettings = Object;

type DomSelector =
export type DomSelector =
string |
Node |
JQuery;

type InstSelector =
export type InstSelector =
DomSelector |
InternalSettings;

type RowIdx = number;
type RowSelector<T> =
export type RowIdx = number;
export type RowSelector<T> =
RowIdx |
string |
Node |
JQuery |
((idx: RowIdx, data: T, node: Node | null) => boolean) |
RowSelector<T>[];

type ColumnIdx = number;
type ColumnSelector =
export type ColumnIdx = number;
export type ColumnSelector =
ColumnIdx |
string |
Node |
JQuery |
((idx:ColumnIdx, data: any, node: Node) => boolean) |
ColumnSelector[];

type CellIdx = {
export type CellIdx = {
row: number;
column: number;
};
type CellSelector =
export type CellSelector =
CellIdx |
string |
Node |
Expand All @@ -56,7 +56,7 @@ type CellSelector =
CellSelector[];


type CellIdxWithVisible = {
export type CellIdxWithVisible = {
row: number;
column: number;
columnVisible: number;
Expand Down

0 comments on commit 75192e8

Please sign in to comment.