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

Pager: filtered rows now equals total rows when ajaxProcessing returns an array. Fixes #667

Browse Source
This commit is contained in:
Mottie 2014-07-02 15:43:15 -05:00
parent 0b380ad323
commit 6ece2fe6b4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/pager/jquery.tablesorter.pager.js
View File

@ -306,10 +306,12 @@
// ensure a zero returned row count doesn't fail the logical || // ensure a zero returned row count doesn't fail the logical ||
rr_count = result[t ? 1 : 0]; rr_count = result[t ? 1 : 0];
p.totalRows = isNaN(rr_count) ? p.totalRows || 0 : rr_count; p.totalRows = isNaN(rr_count) ? p.totalRows || 0 : rr_count;
// can't set filtered rows when returning an array
p.filteredRows = p.totalRows;
d = p.totalRows === 0 ? [""] : result[t ? 0 : 1] || []; // row data d = p.totalRows === 0 ? [""] : result[t ? 0 : 1] || []; // row data
th = result[2]; // headers th = result[2]; // headers
} }
l = d.length; l = d && d.length;
if (d instanceof jQuery) { if (d instanceof jQuery) {
if (p.processAjaxOnInit) { if (p.processAjaxOnInit) {
// append jQuery object // append jQuery object

4
js/widgets/widget-pager.js
View File

@ -508,10 +508,12 @@ tsp = ts.pager = {
// ensure a zero returned row count doesn't fail the logical || // ensure a zero returned row count doesn't fail the logical ||
rr_count = result[t ? 1 : 0]; rr_count = result[t ? 1 : 0];
p.totalRows = isNaN(rr_count) ? p.totalRows || 0 : rr_count; p.totalRows = isNaN(rr_count) ? p.totalRows || 0 : rr_count;
// can't set filtered rows when returning an array
p.filteredRows = p.totalRows;
d = p.totalRows === 0 ? [""] : result[t ? 0 : 1] || []; // row data d = p.totalRows === 0 ? [""] : result[t ? 0 : 1] || []; // row data
th = result[2]; // headers th = result[2]; // headers
} }
l = d.length; l = d && d.length;
if (d instanceof jQuery) { if (d instanceof jQuery) {
if (wo.pager_processAjaxOnInit) { if (wo.pager_processAjaxOnInit) {
// append jQuery object // append jQuery object