From e12785b92ca29b2c10494105991fbb393bf17224 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Thu, 8 Jun 2017 19:09:28 -0500
Subject: [PATCH] Pager: apply fixedHeight patch to widget & code cleanup

---
 addons/pager/jquery.tablesorter.pager.js | 16 +++++++++-------
 js/widgets/widget-pager.js               | 14 ++++++++++----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/addons/pager/jquery.tablesorter.pager.js b/addons/pager/jquery.tablesorter.pager.js
index b62eab88..01cc4a93 100644
--- a/addons/pager/jquery.tablesorter.pager.js
+++ b/addons/pager/jquery.tablesorter.pager.js
@@ -321,20 +321,22 @@
 			},
 
 			fixHeight = function(table, p) {
-				var d, h,
+				var d, h, bs,
 				c = table.config,
 				$b = c.$tbodies.eq(0);
 				$b.find('tr.pagerSavedHeightSpacer').remove();
 				if (p.fixedHeight && !p.isDisabled) {
 					h = $.data(table, 'pagerSavedHeight');
 					if (h) {
-						var bs = 0;
-						if($(table).css('border-spacing').split(" ").length>1){
-							bs = $(table).css('border-spacing').split(" ")[1].replace(/[^-\d\.]/g, '');
+						bs = 0;
+						if ($(table).css('border-spacing').split(' ').length > 1) {
+							bs = $(table).css('border-spacing').split(' ')[1].replace(/[^-\d\.]/g, '');
 						}
-						d = h - $b.height()+(bs*p.size)-bs;
-						if ( d > 5 && $.data(table, 'pagerLastSize') === p.size &&
-						$b.children('tr:visible').length < (p.size === 'all' ? p.totalRows : p.size) ) {
+						d = h - $b.height() + (bs * p.size) - bs;
+						if (
+							d > 5 && $.data(table, 'pagerLastSize') === p.size &&
+							$b.children('tr:visible').length < (p.size === 'all' ? p.totalRows : p.size)
+						) {
 							$b.append('<tr class="pagerSavedHeightSpacer ' + c.selectorRemove.slice(1) + '" style="height:' + d + 'px;"></tr>');
 						}
 					}
diff --git a/js/widgets/widget-pager.js b/js/widgets/widget-pager.js
index 422c9d28..3885ae2b 100644
--- a/js/widgets/widget-pager.js
+++ b/js/widgets/widget-pager.js
@@ -611,7 +611,7 @@
 		},
 
 		fixHeight: function( c ) {
-			var d, h,
+			var d, h, bs,
 				table = c.table,
 				p = c.pager,
 				wo = c.widgetOptions,
@@ -620,9 +620,15 @@
 			if ( wo.pager_fixedHeight && !p.isDisabled ) {
 				h = $.data( table, 'pagerSavedHeight' );
 				if ( h ) {
-					d = h - $b.height();
-					if ( d > 5 && $.data( table, 'pagerLastSize' ) === p.size &&
-						$b.children( 'tr:visible' ).length < ( p.size === 'all' ? p.totalRows : p.size ) ) {
+					bs = 0;
+					if ( $(table).css('border-spacing').split(' ').length > 1 ) {
+						bs = $(table).css('border-spacing').split(' ')[1].replace( /[^-\d\.]/g, '' );
+					}
+					d = h - $b.height() + (bs * p.size) - bs;
+					if (
+						d > 5 && $.data( table, 'pagerLastSize' ) === p.size &&
+						$b.children( 'tr:visible' ).length < ( p.size === 'all' ? p.totalRows : p.size )
+					) {
 						$b.append( '<tr class="pagerSavedHeightSpacer ' + c.selectorRemove.slice( 1 ) +
 							'" style="height:' + d + 'px;"></tr>' );
 					}