From 6fbdc1a3b90bcffdef1438e1ef085566619f5858 Mon Sep 17 00:00:00 2001 From: Mottie Date: Sun, 28 Sep 2014 08:37:47 -0500 Subject: [PATCH] Pager: Add url check to allow ajax updating of table. Fixes #730 --- addons/pager/jquery.tablesorter.pager.js | 4 +++- js/widgets/widget-pager.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/pager/jquery.tablesorter.pager.js b/addons/pager/jquery.tablesorter.pager.js index 0f2ea0d0..aa6a22bb 100644 --- a/addons/pager/jquery.tablesorter.pager.js +++ b/addons/pager/jquery.tablesorter.pager.js @@ -661,6 +661,7 @@ // don't allow rendering multiple times on the same page/size/totalRows/filters/sorts if ( l.page === p.page && l.size === p.size && l.totalRows === p.totalRows && (l.currentFilters || []).join(',') === (p.currentFilters || []).join(',') && + (l.ajaxUrl || '') === (p.ajaxObject.url || '') && l.sortList === (c.sortList || []).join(',') ) { return; } if (c.debug) { ts.log('Pager changing to page ' + p.page); @@ -671,7 +672,8 @@ // fixes #408; modify sortList otherwise it auto-updates sortList : (c.sortList || []).join(','), totalRows : p.totalRows, - currentFilters : p.currentFilters || [] + currentFilters : p.currentFilters || [], + ajaxUrl : p.ajaxObject.url || '' }; if (p.ajax) { getAjax(table, p); diff --git a/js/widgets/widget-pager.js b/js/widgets/widget-pager.js index f7d3ced8..11201fdc 100644 --- a/js/widgets/widget-pager.js +++ b/js/widgets/widget-pager.js @@ -886,6 +886,7 @@ tsp = ts.pager = { // don't allow rendering multiple times on the same page/size/totalRows/filters/sorts if ( l.page === p.page && l.size === p.size && l.totalRows === p.totalRows && (l.currentFilters || []).join(',') === (p.currentFilters || []).join(',') && + (l.ajaxUrl || '') === (p.ajaxObject.url || '') && l.sortList === (c.sortList || []).join(',') ) { return; } @@ -898,7 +899,8 @@ tsp = ts.pager = { // fixes #408; modify sortList otherwise it auto-updates sortList : (c.sortList || []).join(','), totalRows : p.totalRows, - currentFilters : p.currentFilters || [] + currentFilters : p.currentFilters || [], + ajaxUrl : p.ajaxObject.url || '' }; if (p.ajax) { tsp.getAjax(table, c);