Merge branch 'master' of https://github.com/VictorT83/tablesorter into VictorT83-master

Conflicts:
	js/widgets/widget-output.js
This commit is contained in:
Mottie 2015-07-23 07:01:13 -05:00
commit 5637fc44a1

View File

@ -132,11 +132,17 @@
wo.output_hiddenColumnArray = [];
for ( indx = 0; indx < c.columns; indx++ ) {
wo.output_hiddenColumnArray[ indx ] = $.inArray( indx, wo.output_ignoreColumns ) > -1 ||
c.$headerIndexed[ indx ].css( 'display' ) === 'none';
( !wo.output_hiddenColumns && c.$headerIndexed[ indx ].css( 'display' ) === 'none' &&
!c.$headerIndexed[ indx ].hasClass( 'tablesorter-scroller-hidden-column' ) );
}
// get header cells
$this = $el.find('thead tr:visible').not('.' + (ts.css.filterRow || 'tablesorter-filter-row') );
$this = $el
.find('thead tr')
.not('.' + (ts.css.filterRow || 'tablesorter-filter-row') )
.filter( function() {
return wo.output_hiddenColumns || $(this).css('display') !== 'none';
});
headers = output.processRow(c, $this, true, outputJSON);
// all tbody rows