@ -4,20 +4,20 @@
*
*
* To rebuild or modify this file with the latest versions of the included
* To rebuild or modify this file with the latest versions of the included
* software please visit :
* software please visit :
* https : //datatables.net/download/#bs5/dt-2.0. 7
* https : //datatables.net/download/#bs5/dt-2.0. 8
*
*
* Included libraries :
* Included libraries :
* DataTables 2.0 . 7
* DataTables 2.0 . 8
* /
* /
/ * ! D a t a T a b l e s 2 . 0 . 7 / * ! D a t a T a b l e s 2 . 0 . 8
* © SpryMedia Ltd - datatables . net / license
* © SpryMedia Ltd - datatables . net / license
* /
* /
/ * * / * *
* @ summary DataTables
* @ summary DataTables
* @ description Paginate , search and order HTML tables
* @ description Paginate , search and order HTML tables
* @ version 2.0 . 7
* @ version 2.0 . 8
* @ author SpryMedia Ltd
* @ author SpryMedia Ltd
* @ contact www . datatables . net
* @ contact www . datatables . net
* @ copyright SpryMedia Ltd .
* @ copyright SpryMedia Ltd .
@ -563,7 +563,7 @@
*
*
* @ type string
* @ type string
* /
* /
builder : "bs5/dt-2.0. 7 ",
builder : "bs5/dt-2.0. 8 ",
/ * *
/ * *
@ -7572,6 +7572,16 @@
order = opts . order , // applied, current, index (original - compatibility with 1.9)
order = opts . order , // applied, current, index (original - compatibility with 1.9)
page = opts . page ; // all, current
page = opts . page ; // all, current
if ( _fnDataSource ( settings ) == 'ssp' ) {
// In server-side processing mode, most options are irrelevant since
// rows not shown don't exist and the index order is the applied order
// Removed is a special case - for consistency just return an empty
// array
return search === 'removed' ?
[ ] :
_range ( 0 , displayMaster . length ) ;
}
if ( page == 'current' ) {
if ( page == 'current' ) {
// Current page implies that order=current and filter=applied, since it is
// Current page implies that order=current and filter=applied, since it is
// fairly senseless otherwise, regardless of what order and search actually
// fairly senseless otherwise, regardless of what order and search actually
@ -8243,7 +8253,7 @@
_api _register ( _child _obj + '.isShown()' , function ( ) {
_api _register ( _child _obj + '.isShown()' , function ( ) {
var ctx = this . context ;
var ctx = this . context ;
if ( ctx . length && this . length ) {
if ( ctx . length && this . length && ctx [ 0 ] . aoData [ this [ 0 ] ] ) {
// _detailsShown as false or undefined will fall through to return false
// _detailsShown as false or undefined will fall through to return false
return ctx [ 0 ] . aoData [ this [ 0 ] ] . _detailsShow || false ;
return ctx [ 0 ] . aoData [ this [ 0 ] ] . _detailsShow || false ;
}
}
@ -8266,7 +8276,7 @@
// can be an array of these items, comma separated list, or an array of comma
// can be an array of these items, comma separated list, or an array of comma
// separated lists
// separated lists
var _ _re _column _selector = /^([^:]+) :(name|title|visIdx|visible)$/;
var _ _re _column _selector = /^([^:]+) ? :(name|title|visIdx|visible)$/;
// r1 and r2 are redundant - but it means that the parameters match for the
// r1 and r2 are redundant - but it means that the parameters match for the
@ -8338,17 +8348,24 @@
switch ( match [ 2 ] ) {
switch ( match [ 2 ] ) {
case 'visIdx' :
case 'visIdx' :
case 'visible' :
case 'visible' :
var idx = parseInt ( match [ 1 ] , 10 ) ;
if ( match [ 1 ] ) {
// Visible index given, convert to column index
var idx = parseInt ( match [ 1 ] , 10 ) ;
if ( idx < 0 ) {
// Visible index given, convert to column index
// Counting from the right
if ( idx < 0 ) {
var visColumns = columns . map ( function ( col , i ) {
// Counting from the right
return col . bVisible ? i : null ;
var visColumns = columns . map ( function ( col , i ) {
} ) ;
return col . bVisible ? i : null ;
return [ visColumns [ visColumns . length + idx ] ] ;
} ) ;
return [ visColumns [ visColumns . length + idx ] ] ;
}
// Counting from the left
return [ _fnVisibleToColumnIndex ( settings , idx ) ] ;
}
}
// Counting from the left
return [ _fnVisibleToColumnIndex ( settings , idx ) ] ;
// `:visible` on its own
return columns . map ( function ( col , i ) {
return col . bVisible ? i : null ;
} ) ;
case 'name' :
case 'name' :
// match by name. `names` is column index complete and in order
// match by name. `names` is column index complete and in order
@ -9623,7 +9640,7 @@
* @ type string
* @ type string
* @ default Version number
* @ default Version number
* /
* /
DataTable . version = "2.0. 7 ";
DataTable . version = "2.0. 8 ";
/ * *
/ * *
* Private data store , containing all of the settings objects that are
* Private data store , containing all of the settings objects that are
Mathijs van Veluw
5 months ago
committed by
GitHub