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

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

Browse Source 
Conflicts:
	js/widgets/widget-output.js
This commit is contained in:
Mottie 2015-07-23 07:01:13 -05:00
commit 5637fc44a1
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/widgets/widget-output.js
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
@ -341,7 +347,7 @@
output_headerRows : false, // if true, include multiple header rows (JSON only)
output_delivery : 'popup', // popup, download
output_saveRows : 'filtered', // (a)ll, (v)isible, (f)iltered or jQuery filter selector
output_duplicateSpans: true, // duplicate output data in tbody colspan/rowspan
output_duplicateSpans : true, // duplicate output data in tbody colspan/rowspan
output_replaceQuote : '\u201c;', // left double quote
output_includeHTML : false,
output_trimSpaces : true,