library-mirrors/tablesorter
1
0
Fork 0
mirror of https://github.com/Mottie/tablesorter.git synced 2024-11-15 23:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

columnSelector: Fix scroller widget compatibility. See #1682

Browse Source
This commit is contained in:
Rob Garrison 2019-08-03 12:52:34 -05:00
parent 55fdf5b69b
commit 3e152c4c77
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/widgets/widget-columnSelector.js
View File

@ -1,4 +1,4 @@
/* Widget: columnSelector (responsive table widget) - updated 2018-03-18 (v2.30.0) *//* /* Widget: columnSelector (responsive table widget) - updated 2018-08-03 (v2.31.2) *//*
* Requires tablesorter v2.8+ and jQuery 1.7+ * Requires tablesorter v2.8+ and jQuery 1.7+
* by Justin Hallett & Rob Garrison * by Justin Hallett & Rob Garrison
*/ */
@ -399,6 +399,27 @@
}); });
} }
}, },
// Extracted from buildHeaders in core; needed for scroller widget compatibility
findHeaders : function(c) {
var indx, $temp,
sel = '.' + ts.css.scrollerHeader + ' thead > tr > ',
$headers = $(sel + 'th,' + sel + 'td'),
result = [];
for ( indx = 0; indx < c.columns; indx++ ) {
// Use $headers.parent() in case selectorHeaders doesn't point to the th/td
$temp = $headers.filter( '[data-column="' + indx + '"]' );
// target sortable column cells, unless there are none, then use non-sortable cells
// .last() added in jQuery 1.4; use .filter(':last') to maintain compatibility with jQuery v1.2.6
result[ indx ] = $temp.length ?
$temp.not( '.sorter-false' ).length ?
$temp.not( '.sorter-false' ).filter( ':last' ) :
$temp.filter( ':last' ) :
$();
}
return result;
},
adjustColspans: function(c, wo) { adjustColspans: function(c, wo) {
var index, cols, col, span, end, $cell, var index, cols, col, span, end, $cell,
colSel = c.selector, colSel = c.selector,
@ -409,7 +430,10 @@
.add( $(c.namespace + '_extra_table').children( 'thead, tfoot' ).children().children() ) .add( $(c.namespace + '_extra_table').children( 'thead, tfoot' ).children().children() )
// include grouping widget headers (they have colspans!) // include grouping widget headers (they have colspans!)
.add( c.$table.find( '.group-header' ).children() ), .add( c.$table.find( '.group-header' ).children() ),
len = $headers.length; len = $headers.length,
$headerIndexed = ts.hasWidget(c.table, 'scroller')
? tsColSel.findHeaders(c)
: c.$headerIndexed;
for ( index = 0; index < len; index++ ) { for ( index = 0; index < len; index++ ) {
$cell = $headers.eq(index); $cell = $headers.eq(index);
col = parseInt( $cell.attr('data-column'), 10 ) || $cell[0].cellIndex; col = parseInt( $cell.attr('data-column'), 10 ) || $cell[0].cellIndex;
@ -418,7 +442,7 @@
if ( span > 1 ) { if ( span > 1 ) {
for ( cols = col; cols < end; cols++ ) { for ( cols = col; cols < end; cols++ ) {
if ( !autoModeOn && colSel.states[ cols ] === false || if ( !autoModeOn && colSel.states[ cols ] === false ||
autoModeOn && c.$headerIndexed[ cols ] && !c.$headerIndexed[ cols ].is(':visible') ) { autoModeOn && $headerIndexed[ cols ] && !$headerIndexed[ cols ].is(':visible') ) {
span--; span--;
} }
} }