From 829e5a62b57e9d282e2a0ccbc4699ec9aeb566ad Mon Sep 17 00:00:00 2001 From: Rob Garrison Date: Tue, 28 Mar 2017 14:21:58 -0500 Subject: [PATCH] Pager: stop using combined filter values. See #1363 --- addons/pager/jquery.tablesorter.pager.js | 5 ++++- js/widgets/widget-pager.js | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/pager/jquery.tablesorter.pager.js b/addons/pager/jquery.tablesorter.pager.js index 5f623b52..fbc7d060 100644 --- a/addons/pager/jquery.tablesorter.pager.js +++ b/addons/pager/jquery.tablesorter.pager.js @@ -967,7 +967,10 @@ .bind('filterInit filterStart '.split(' ').join(namespace + ' '), function(e, filters) { p.currentFilters = $.isArray(filters) ? filters : c.$table.data('lastSearch'); // don't change page if filters are the same (pager updating, etc) - if (e.type === 'filterStart' && p.pageReset !== false && (c.lastCombinedFilter || '') !== (p.currentFilters || []).join('')) { + if ( + e.type === 'filterStart' && + p.pageReset !== false && + (c.lastSearch || []).join(',') !== (p.currentFilters || []).join(',')) { p.page = p.pageReset; // fixes #456 & #565 } }) diff --git a/js/widgets/widget-pager.js b/js/widgets/widget-pager.js index 95a6850e..2f92d404 100644 --- a/js/widgets/widget-pager.js +++ b/js/widgets/widget-pager.js @@ -252,7 +252,8 @@ p.currentFilters = $.isArray( filters ) ? filters : c.$table.data( 'lastSearch' ); // don't change page if filters are the same (pager updating, etc) if ( e.type === 'filterStart' && wo.pager_pageReset !== false && - ( c.lastCombinedFilter || '' ) !== ( p.currentFilters || [] ).join( '' ) ) { + ( c.lastSearch || [] ).join( ',' ) !== ( p.currentFilters || [] ).join( ',' ) + ) { p.page = wo.pager_pageReset; // fixes #456 & #565 } })