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

filter optimization, search already filtered rows - see #313

Browse Source
This commit is contained in:
Mottie 2013-05-20 10:40:32 -05:00
parent 79a64e3044
commit 361153a7d1
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,6 +350,7 @@ ts.addWidget({
filter_regex : { filter_regex : {
"regex" : /^\/((?:\\\/|[^\/])+)\/([mig]{0,3})?$/, // regex to test for regex "regex" : /^\/((?:\\\/|[^\/])+)\/([mig]{0,3})?$/, // regex to test for regex
"child" : /tablesorter-childRow/, // child row class name; this gets updated in the script "child" : /tablesorter-childRow/, // child row class name; this gets updated in the script
"filtered" : /filtered/, // filtered (hidden) row class name; updated in the script
"type" : /undefined|number/, // check type "type" : /undefined|number/, // check type
"exact" : /(^[\"|\'|=])|([\"|\'|=]$)/g, // exact match "exact" : /(^[\"|\'|=])|([\"|\'|=]$)/g, // exact match
"nondigit" : /[^\w,. \-()]/g, // replace non-digits (from digit & currency parser) "nondigit" : /[^\w,. \-()]/g, // replace non-digits (from digit & currency parser)
@ -398,9 +399,8 @@ ts.addWidget({
} }
}, },
findRows = function(filter, v, cv){ findRows = function(filter, v, cv){
var $tb, $tr, $td, cr, r, l, ff, time, r1, r2; var $tb, $tr, $td, cr, r, l, ff, time, r1, r2, searchFiltered;
if (c.debug) { time = new Date(); } if (c.debug) { time = new Date(); }
for (k = 0; k < b.length; k++ ){ for (k = 0; k < b.length; k++ ){
if (b.eq(k).hasClass(c.cssInfoBlock)) { continue; } // ignore info blocks, issue #264 if (b.eq(k).hasClass(c.cssInfoBlock)) { continue; } // ignore info blocks, issue #264
$tb = ts.processTbody(table, b.eq(k), true); $tb = ts.processTbody(table, b.eq(k), true);
@ -409,10 +409,17 @@ ts.addWidget({
if (cv === '' || wo.filter_serversideFiltering){ if (cv === '' || wo.filter_serversideFiltering){
$tr.show().removeClass(wo.filter_filteredRow); $tr.show().removeClass(wo.filter_filteredRow);
} else { } else {
// optimize searching only through already filtered rows - see #313
searchFiltered = true;
r = $t.data('lastSearch') || [];
$.each(v, function(i,val){
searchFiltered = val.indexOf(r[i] || '') === 0 && searchFiltered;
});
// loop through the rows // loop through the rows
for (j = 0; j < l; j++){ for (j = 0; j < l; j++){
// skip child rows r = $tr[j].className;
if (wo.filter_regex.child.test($tr[j].className)) { continue; } // skip child rows & already filtered rows
if ( wo.filter_regex.child.test(r) || (searchFiltered && wo.filter_regex.filtered.test(r)) ) { continue; }
r = true; r = true;
cr = $tr.eq(j).nextUntil('tr:not(.' + c.cssChildRow + ')'); cr = $tr.eq(j).nextUntil('tr:not(.' + c.cssChildRow + ')');
// so, if "table.config.widgetOptions.filter_childRows" is true and there is // so, if "table.config.widgetOptions.filter_childRows" is true and there is
@ -599,6 +606,7 @@ ts.addWidget({
time = new Date(); time = new Date();
} }
wo.filter_regex.child = new RegExp(c.cssChildRow); wo.filter_regex.child = new RegExp(c.cssChildRow);
wo.filter_regex.filtered = new RegExp(wo.filter_filteredRow);
// don't build filter row if columnFilters is false or all columns are set to "filter-false" - issue #156 // don't build filter row if columnFilters is false or all columns are set to "filter-false" - issue #156
if (wo.filter_columnFilters !== false && $ths.filter('.filter-false').length !== $ths.length){ if (wo.filter_columnFilters !== false && $ths.filter('.filter-false').length !== $ths.length){
// build filter row // build filter row