Pager: stop using combined filter values. See #1363

Mottie · Mar 28, 2017 · 829e5a6 · 829e5a6
1 parent ea73edd
commit 829e5a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
 					}
 				})