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 search delay is no longer ignored

Browse Source
This commit is contained in:
Mottie 2013-05-20 10:05:08 -05:00
parent aad21bbf24
commit 79a64e3044
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -582,6 +582,18 @@ ts.addWidget({
buildSelect(i, updating, t.hasClass(wo.filter_onlyAvail)); buildSelect(i, updating, t.hasClass(wo.filter_onlyAvail));
} }
} }
},
searching = function(filter){
if (typeof filter === 'undefined' || filter === true){
// delay filtering
clearTimeout(timer);
timer = setTimeout(function(){
checkFilters(filter);
}, wo.filter_liveSearch ? wo.filter_searchDelay : 10);
} else {
// skip delay
checkFilters(filter);
}
}; };
if (c.debug){ if (c.debug){
time = new Date(); time = new Date();
@ -644,11 +656,12 @@ ts.addWidget({
if (e.type === 'filterReset') { if (e.type === 'filterReset') {
$t.find('.' + css).val(''); $t.find('.' + css).val('');
} }
// send false argument to force a new search; otherwise if the filter hasn't changed, it will return
filter = e.type === 'search' ? filter : e.type === 'updateComplete' ? $t.data('lastSearch') : '';
checkFilters(filter);
if (e.type === 'filterEnd') { if (e.type === 'filterEnd') {
buildDefault(true); buildDefault(true);
} else {
// send false argument to force a new search; otherwise if the filter hasn't changed, it will return
filter = e.type === 'search' ? filter : e.type === 'updateComplete' ? $t.data('lastSearch') : '';
searching(filter);
} }
return false; return false;
}) })
@ -661,18 +674,7 @@ ts.addWidget({
( (e.which < 32 && e.which !== 8 && wo.filter_liveSearch === true && e.which !== 13) || (e.which >= 37 && e.which <=40) || (e.which !== 13 && wo.filter_liveSearch === false) ) ) ) { ( (e.which < 32 && e.which !== 8 && wo.filter_liveSearch === true && e.which !== 13) || (e.which >= 37 && e.which <=40) || (e.which !== 13 && wo.filter_liveSearch === false) ) ) ) {
return; return;
} }
// skip delay searching(filter);
if (typeof filter !== 'undefined' || filter === false){
checkFilters();
// no return false; allow search event propogation up to table
} else {
// delay filtering
clearTimeout(timer);
timer = setTimeout(function(){
checkFilters(filter);
}, wo.filter_liveSearch ? wo.filter_searchDelay : 10);
return false;
}
}); });
// parse columns after formatter, in case the class is added at that point // parse columns after formatter, in case the class is added at that point
@ -802,7 +804,7 @@ ts.setFilters = function(table, filter, apply) {
valid = c && c.$filters ? c.$filters.find('.' + c.widgetOptions.filter_cssFilter).each(function(i, el) { valid = c && c.$filters ? c.$filters.find('.' + c.widgetOptions.filter_cssFilter).each(function(i, el) {
$(el).val(filter[i] || ''); $(el).val(filter[i] || '');
}) || false : false; }) || false : false;
if (valid && apply) { $t.trigger('search'); } if (valid && apply) { $t.trigger('search', false); }
return !!valid; return !!valid;
}; };