library-mirrors/tablesorter
1
0
Fork 0
mirror of https://github.com/Mottie/tablesorter.git synced 2025-01-12 15:24:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Filter: fix child row filtering

Browse Source
This commit is contained in:
Mottie 2014-05-21 17:11:39 -05:00
parent bb421f9a25
commit ff3730093c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/jquery.tablesorter.widgets.js
View File

@ -905,11 +905,14 @@ ts.filter = {
// $rows = $tbody.children('tr').not(c.selectorRemove); // $rows = $tbody.children('tr').not(c.selectorRemove);
columnIndex = c.columns; columnIndex = c.columns;
// convert stored rows into a jQuery object // convert stored rows into a jQuery object
$rows = true ? $( $.map(c.cache[tbodyIndex].normalized, function(el){ return el[columnIndex].$row.get(); }) ) : $tbody.children('tr').not(c.selectorRemove); $rows = $( $.map(c.cache[tbodyIndex].normalized, function(el){ return el[columnIndex].$row.get(); }) );
len = $rows.length;
if (combinedFilters === '' || wo.filter_serversideFiltering) { if (combinedFilters === '' || wo.filter_serversideFiltering) {
$rows.removeClass(wo.filter_filteredRow).not('.' + c.cssChildRow).show(); $rows.removeClass(wo.filter_filteredRow).not('.' + c.cssChildRow).show();
} else { } else {
// filter out child rows
$rows = $rows.not('.' + c.cssChildRow);
len = $rows.length;
// optimize searching only through already filtered rows - see #313 // optimize searching only through already filtered rows - see #313
searchFiltered = true; searchFiltered = true;
lastSearch = c.lastSearch || c.$table.data('lastSearch') || []; lastSearch = c.lastSearch || c.$table.data('lastSearch') || [];
@ -928,7 +931,7 @@ ts.filter = {
// don't search only filtered if the value is negative ('> -10' => '> -100' will ignore hidden rows) // don't search only filtered if the value is negative ('> -10' => '> -100' will ignore hidden rows)
!(/(>=?\s*-\d)/.test(val) || /(<=?\s*\d)/.test(val)) && !(/(>=?\s*-\d)/.test(val) || /(<=?\s*\d)/.test(val)) &&
// if filtering using a select without a "filter-match" class (exact match) - fixes #593 // if filtering using a select without a "filter-match" class (exact match) - fixes #593
!( val !== '' && c.$filters.eq(indx).find('select').length && !c.$headers.filter('[data-column="' + indx + '"]:last').hasClass('filter-match') ); !( val !== '' && c.$filters && c.$filters.eq(indx).find('select').length && !c.$headers.filter('[data-column="' + indx + '"]:last').hasClass('filter-match') );
} }
notFiltered = $rows.not('.' + wo.filter_filteredRow).length; notFiltered = $rows.not('.' + wo.filter_filteredRow).length;
// can't search when all rows are hidden - this happens when looking for exact matches // can't search when all rows are hidden - this happens when looking for exact matches