Pager (addon): ensure ajax is called after filter widget init. Fixes #1389

This commit is contained in:
Rob Garrison 2017-06-08 11:32:55 -05:00
parent 23c94a726d
commit 31e2376eb6
2 changed files with 5 additions and 1 deletions

View File

@ -969,6 +969,10 @@
.bind('filterInit filterStart '.split(' ').join(namespace + ' '), function(e, filters) { .bind('filterInit filterStart '.split(' ').join(namespace + ' '), function(e, filters) {
p.currentFilters = $.isArray(filters) ? filters : c.$table.data('lastSearch'); p.currentFilters = $.isArray(filters) ? filters : c.$table.data('lastSearch');
var filtersEqual; var filtersEqual;
if (p.ajax && e.type === 'filterInit') {
// ensure pager ajax is called after filter widget has initialized
return moveToPage( table, p, false );
}
if (ts.filter.equalFilters) { if (ts.filter.equalFilters) {
filtersEqual = ts.filter.equalFilters(c, c.lastSearch, p.currentFilters); filtersEqual = ts.filter.equalFilters(c, c.lastSearch, p.currentFilters);
} else { } else {

File diff suppressed because one or more lines are too long