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: filteredRows now properly calculated when first tbody set with cssInfoBlock class

Browse Source
This commit is contained in:
Mottie 2015-01-09 07:22:25 -06:00
parent 0a9c91804e
commit 638d070f3a
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,15 +132,18 @@
}, },
calcFilters = function(table, p) { calcFilters = function(table, p) {
var c = table.config, var tbodyIndex,
c = table.config,
hasFilters = c.$table.hasClass('hasFilters'); hasFilters = c.$table.hasClass('hasFilters');
if (hasFilters && !p.ajaxUrl) { if (hasFilters && !p.ajaxUrl) {
if ($.isEmptyObject(c.cache)) { if ($.isEmptyObject(c.cache)) {
// delayInit: true so nothing is in the cache // delayInit: true so nothing is in the cache
p.filteredRows = p.totalRows = c.$tbodies.eq(0).children('tr').not( p.countChildRows ? '' : '.' + c.cssChildRow ).length; p.filteredRows = p.totalRows = c.$tbodies.eq(0).children('tr').not( p.countChildRows ? '' : '.' + c.cssChildRow ).length;
} else { } else {
// just in case the pager tbody isn't the first tbody
tbodyIndex = c.$table.children('tbody').index( c.$tbodies.eq(0) );
p.filteredRows = 0; p.filteredRows = 0;
$.each(c.cache[0].normalized, function(i, el) { $.each(c.cache[tbodyIndex].normalized, function(i, el) {
p.filteredRows += p.regexRows.test(el[c.columns].$row[0].className) ? 0 : 1; p.filteredRows += p.regexRows.test(el[c.columns].$row[0].className) ? 0 : 1;
}); });
} }
@ -644,7 +647,8 @@
c.$table.trigger('updateCache', [ function(){ c.$table.trigger('updateCache', [ function(){
var i, var i,
rows = [], rows = [],
n = table.config.cache[0].normalized; tbodyIndex = c.$table.children('tbody').index( c.$tbodies.eq(0) ),
n = table.config.cache[tbodyIndex].normalized;
p.totalRows = n.length; p.totalRows = n.length;
for (i = 0; i < p.totalRows; i++) { for (i = 0; i < p.totalRows; i++) {
rows.push(n[i][c.columns].$row); rows.push(n[i][c.columns].$row);

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

@ -356,7 +356,8 @@ tsp = ts.pager = {
}, },
calcFilters: function(table, c) { calcFilters: function(table, c) {
var wo = c.widgetOptions, var tbodyIndex,
wo = c.widgetOptions,
p = c.pager, p = c.pager,
hasFilters = c.$table.hasClass('hasFilters'); hasFilters = c.$table.hasClass('hasFilters');
if (hasFilters && !wo.pager_ajaxUrl) { if (hasFilters && !wo.pager_ajaxUrl) {
@ -364,8 +365,10 @@ tsp = ts.pager = {
// delayInit: true so nothing is in the cache // delayInit: true so nothing is in the cache
p.filteredRows = p.totalRows = c.$tbodies.eq(0).children('tr').not( wo.pager_countChildRows ? '' : '.' + c.cssChildRow ).length; p.filteredRows = p.totalRows = c.$tbodies.eq(0).children('tr').not( wo.pager_countChildRows ? '' : '.' + c.cssChildRow ).length;
} else { } else {
// just in case the pager tbody isn't the first tbody
tbodyIndex = c.$table.children('tbody').index( c.$tbodies.eq(0) );
p.filteredRows = 0; p.filteredRows = 0;
$.each(c.cache[0].normalized, function(i, el) { $.each(c.cache[tbodyIndex].normalized, function(i, el) {
p.filteredRows += p.regexRows.test(el[c.columns].$row[0].className) ? 0 : 1; p.filteredRows += p.regexRows.test(el[c.columns].$row[0].className) ? 0 : 1;
}); });
} }
@ -871,7 +874,8 @@ tsp = ts.pager = {
if ( !$.isEmptyObject(table.config.cache) ) { if ( !$.isEmptyObject(table.config.cache) ) {
var i, var i,
rows = [], rows = [],
n = table.config.cache[0].normalized; tbodyIndex = c.$table.children('tbody').index( c.$tbodies.eq(0) ),
n = table.config.cache[tbodyIndex].normalized;
p.totalRows = n.length; p.totalRows = n.length;
for (i = 0; i < p.totalRows; i++) { for (i = 0; i < p.totalRows; i++) {
rows.push(n[i][c.columns].$row); rows.push(n[i][c.columns].$row);