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: ensure initial filter settings get applied

Browse Source
This commit is contained in:
Mottie 2014-09-09 16:23:29 -05:00
parent de68dff8b9
commit ff16bfd090
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -756,7 +756,13 @@ ts.filter = {
}, },
filterInitComplete: function(c){ filterInitComplete: function(c){
var wo = c.widgetOptions, var wo = c.widgetOptions,
count = 0; count = 0,
completed = function(){
wo.filter_initialized = true;
wo.filter_initializing = false;
ts.filter.findRows(c.table, c.$table.data('lastSearch'), null);
c.$table.trigger('filterInit', c);
};
$.each( wo.filter_formatterInit, function(i, val) { $.each( wo.filter_formatterInit, function(i, val) {
if (val === 1) { if (val === 1) {
count++; count++;
@ -765,19 +771,16 @@ ts.filter = {
clearTimeout(wo.filter_initTimer); clearTimeout(wo.filter_initTimer);
if (!wo.filter_initialized && count === wo.filter_formatterCount) { if (!wo.filter_initialized && count === wo.filter_formatterCount) {
// filter widget initialized // filter widget initialized
wo.filter_initialized = true; completed();
wo.filter_initializing = false;
c.$table.trigger('filterInit', c);
} else if (!wo.filter_initialized) { } else if (!wo.filter_initialized) {
// fall back in case a filter_formatter doesn't call // fall back in case a filter_formatter doesn't call
// $.tablesorter.filter.formatterUpdated($cell, column), and the count is off // $.tablesorter.filter.formatterUpdated($cell, column), and the count is off
wo.filter_initTimer = setTimeout(function(){ wo.filter_initTimer = setTimeout(function(){
wo.filter_initialized = true; completed();
wo.filter_initializing = false;
c.$table.trigger('filterInit', c);
}, 500); }, 500);
} }
}, },
setDefaults: function(table, c, wo) { setDefaults: function(table, c, wo) {
var isArray, saved, indx, var isArray, saved, indx,
// get current (default) filters // get current (default) filters