From cb3ee451b899550439e42f6e570fdfb387ec366c Mon Sep 17 00:00:00 2001 From: Mottie Date: Fri, 1 Nov 2013 13:43:18 -0500 Subject: [PATCH] pager: calculate correct total rows when countChildRows is true --- addons/pager/jquery.tablesorter.pager.js | 7 ++++--- js/widgets/widget-pager.js | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/addons/pager/jquery.tablesorter.pager.js b/addons/pager/jquery.tablesorter.pager.js index 5749032f..36db47c9 100644 --- a/addons/pager/jquery.tablesorter.pager.js +++ b/addons/pager/jquery.tablesorter.pager.js @@ -529,10 +529,11 @@ }; $this.appender = function(table, rows) { - var p = table.config.pager; + var c = table.config, + p = c.pager; if ( !p.ajax ) { - table.config.rowsCopy = rows; - p.totalRows = rows.length; + c.rowsCopy = rows; + p.totalRows = p.countChildRows ? c.$tbodies.eq(0).children().length : rows.length; p.size = $.data(table, 'pagerLastSize') || p.size; p.totalPages = Math.ceil( p.totalRows / ( p.size || 10 ) ); renderTable(table, rows, p); diff --git a/js/widgets/widget-pager.js b/js/widgets/widget-pager.js index eac36d04..9b2c49f4 100644 --- a/js/widgets/widget-pager.js +++ b/js/widgets/widget-pager.js @@ -732,14 +732,14 @@ tsp = ts.pager = { }, appender: function(table, rows) { - var p = table.config.pager; + var c = table.config, + p = c.pager; if ( !p.ajax ) { - table.config.rowsCopy = rows; - p.totalRows = rows.length; + c.rowsCopy = rows; + p.totalRows = c.widgetOptions.pager_countChildRows ? c.$tbodies.eq(0).children().length : rows.length; p.size = $.data(table, 'pagerLastSize') || p.size; p.totalPages = Math.ceil( p.totalRows / ( p.size || 10 ) ); tsp.moveToPage(table, p); - // tsp.renderTable(table, rows); } }