jquery-tablesorter 1.19.3 → 1.19.4

data/vendor/assets/javascripts/jquery-tablesorter/parsers/parser-date-two-digit-year.js

@@ -1,4 +1,4 @@
-/*! Parser: two digit year - updated 10/26/2014 (v2.18.0) */
+/*! Parser: two digit year - updated 11/22/2015 (v2.24.6) */
 /* Demo: http://mottie.github.io/tablesorter/docs/example-parsers-dates.html */
 /*jshint jquery:true */
 ;(function($){
@@ -13,10 +13,9 @@
 	ts = $.tablesorter,
 	now = new Date().getFullYear();
 
-	ts.dates = $.extend({}, ts.dates, {
-		regxxxxyy: /(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{2})/,
-		regyyxxxx: /(\d{2})[\/\s](\d{1,2})[\/\s](\d{1,2})/
-	});
+	if ( !ts.dates ) { ts.dates = {}; }
+	ts.dates.regxxxxyy = /(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{2})/;
+	ts.dates.regyyxxxx = /(\d{2})[\/\s](\d{1,2})[\/\s](\d{1,2})/;
 
 	ts.formatDate = function(s, regex, format, table){
 		if (s) {

data/vendor/assets/javascripts/jquery-tablesorter/parsers/parser-date-weekday.js

@@ -1,40 +1,38 @@
-/*! Parser: weekday - updated 11/2/2015 (v2.24.1) */
+/*! Parser: weekday - updated 11/22/2015 (v2.24.6) */
 /* Demo: http://jsfiddle.net/Mottie/abkNM/4169/ */
 /*jshint jquery:true */
 ;(function($){
 	'use strict';
 
 	var ts = $.tablesorter;
-	ts.dates = $.extend( true, {}, {
-		// See http://mottie.github.io/tablesorter/docs/example-widget-grouping.html
-		// for details on how to use CLDR data for a locale to add data for this parser
-		// CLDR returns { sun: "Sun", mon: "Mon", tue: "Tue", wed: "Wed", thu: "Thu", ... }
-		weekdays : {
-			'en' :  {
-				'sun' : 'Sun',
-				'mon' : 'Mon',
-				'tue' : 'Tue',
-				'wed' : 'Wed',
-				'thu' : 'Thu',
-				'fri' : 'Fri',
-				'sat' : 'Sat'
-			}
-		},
-
-		// set table.config.weekStarts to change weekday start date for your locale
-		// cross-reference of a date on which the week starts on a...
-		// https://github.com/unicode-cldr/cldr-core/blob/master/supplemental/weekData.json
-		weekStartList : {
-			'sun' : '1995', // Sun 1/1/1995
-			'mon' : '1996', // Mon 1/1/1996
-			'fri' : '1999', // Friday 1/1/1999
-			'sat' : '2000'  // Sat 1/1/2000
-		},
-
-		// do not modify this array; it is used for cross referencing
-		weekdaysXref : [ 'sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat' ]
 
-	}, ts.dates );
+	if ( !ts.dates ) { ts.dates = {}; }
+	if ( !ts.dates.weekdays ) { ts.dates.weekdays = {}; }
+	// See http://mottie.github.io/tablesorter/docs/example-widget-grouping.html
+	// for details on how to use CLDR data for a locale to add data for this parser
+	// CLDR returns { sun: "Sun", mon: "Mon", tue: "Tue", wed: "Wed", thu: "Thu", ... }
+	ts.dates.weekdays.en = {
+		'sun' : 'Sun',
+		'mon' : 'Mon',
+		'tue' : 'Tue',
+		'wed' : 'Wed',
+		'thu' : 'Thu',
+		'fri' : 'Fri',
+		'sat' : 'Sat'
+	};
+	// set table.config.weekStarts to change weekday start date for your locale
+	// cross-reference of a date on which the week starts on a...
+	// https://github.com/unicode-cldr/cldr-core/blob/master/supplemental/weekData.json
+	// locale agnostic
+	ts.dates.weekStartList = {
+		'sun' : '1995', // Sun 1/1/1995
+		'mon' : '1996', // Mon 1/1/1996
+		'fri' : '1999', // Friday 1/1/1999
+		'sat' : '2000'  // Sat 1/1/2000
+	};
+	// do not modify this array; it is used for cross referencing weekdays
+	// locale agnostic
+	ts.dates.weekdaysXref = [ 'sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat' ];
 
 	ts.addParser({
 		id: 'weekday',

data/vendor/assets/javascripts/jquery-tablesorter/parsers/parser-image.js

@@ -1,5 +1,6 @@
 /*! Parser: image - new 7/17/2014 (v2.17.5) */
 /* alt attribute parser for jQuery 1.7+ & tablesorter 2.7.11+ */
+/* NOTE! Moved to jquery.tablesorter.js (core) in v2.18.0 */
 /*jshint jquery:true, unused:false */
 ;(function($){
 	'use strict';

data/vendor/assets/javascripts/jquery-tablesorter/parsers/parser-input-select.js

@@ -1,4 +1,4 @@
-/*! Parser: input & select - updated 10/31/2015 (v2.24.0) *//*
+/*! Parser: input & select - updated 11/22/2015 (v2.24.6) *//*
  * for jQuery 1.7+ & tablesorter 2.7.11+
  * Demo: http://mottie.github.com/tablesorter/docs/example-widget-grouping.html
  */
@@ -10,7 +10,8 @@
 		// do something here to update your server, if needed
 		// event = change event object
 		// $table = jQuery object of the table that was just updated
-		// $input = jQuery object of the input or select that was modified
+		// $input = jQuery object(s) of the input or select that was modified; in v2.24.6,
+		//   if the thead has a checkbox, $input may include multiple elements
 	};
 
 	// Custom parser for parsing input values
@@ -125,22 +126,20 @@
 	// you can change it to use delegate (v1.4.3+) or live (v1.3+) as desired
 	// if this code interferes somehow, target the specific table $('#mytable'), instead of $('table')
 	$( function() {
+		if ( !$.fn.on ) { return; }
 		$( 'table' ).on( 'tablesorter-initialized updateComplete', function() {
-			var namespace = '.parser-forms',
-			restoreValue = function( isTbody ) {
+			this.tablesorterBusy = false;
+			var namespace = '.parser-forms';
+			// bind to .tablesorter (default class name)
+			$( this ).children( 'tbody' )
+			.off( namespace )
+			.on( 'mouseleave' + namespace, function( event ) {
 				// make sure we restore original values (trigger blur)
 				// isTbody is needed to prevent the select from closing in IE
 				// see https://connect.microsoft.com/IE/feedbackdetail/view/962618/
-				if ( isTbody ) {
+				if ( event.target.nodeName === 'TBODY' ) {
 					$( ':focus' ).blur();
 				}
-				return;
-			};
-			// bind to .tablesorter (default class name)
-			$( this ).children( 'tbody' )
-			.off( namespace )
-			.on( 'mouseleave' + namespace, function( event ) {
-				restoreValue( event.target.nodeName === 'TBODY' );
 			})
 			.on( 'focus' + namespace, 'select, input, textarea', function() {
 				$( this ).data( 'ts-original-value', this.value );
@@ -162,28 +161,92 @@
 					( event.target.nodeName === 'INPUT' || event.target.nodeName === 'TEXTAREA' && event.altKey ) ) ) {
 					var undef,
 						$target = $( event.target ),
+						isCheckbox = event.target.type === 'checkbox',
 						$cell = $target.closest( 'td' ),
 						$table = $cell.closest( 'table' ),
 						indx = $cell[ 0 ].cellIndex,
 						c = $table[ 0 ].config || false,
+						busy = $table.length && $table[ 0 ].tablesorterBusy,
 						$hdr = c && c.$headerIndexed && c.$headerIndexed[ indx ] || [],
-						val = $target.val();
-					// abort if not a tablesorter table, or don't use updateCell if column is set
+						val = isCheckbox ? event.target.checked : $target.val();
+					// abort if not a tablesorter table, or busy, or don't use updateCell if column is set
 					// to 'sorter-false' and 'filter-false', or column is set to 'parser-false'
-					if ( $hdr.length && ( $hdr.hasClass( 'parser-false' ) ||
-						( $hdr.hasClass( 'sorter-false' ) && $hdr.hasClass( 'filter-false' ) ) ) ) {
+					if ( $.isEmptyObject( c ) || busy !== false || $hdr.length && ( $hdr.hasClass( 'parser-false' ) ||
+						( $hdr.hasClass( 'sorter-false' ) && $hdr.hasClass( 'filter-false' ) ) ) ||
+						// table already updating; get out of here, we might be in an endless loop (in IE)! See #971
+						( event.type === 'change' && c.table.isUpdating ) ) {
 						return;
 					}
 					// ignore change event if nothing changed
-					if ( c && val !== $target.data( 'ts-original-value' ) || event.target.type === 'checkbox' ) {
+					if ( c && val !== $target.data( 'ts-original-value' ) || isCheckbox ) {
 						$target.data( 'ts-original-value', val );
+						$table[ 0 ].tablesorterBusy = true;
 						// pass undefined resort value so it falls back to config.resort setting
 						$.tablesorter.updateCell( c, $cell, undef, function() {
 							updateServer( event, $table, $target );
+							$table[ 0 ].tablesorterBusy = false;
 						});
 					}
 				}
 			});
+
+			// add code for a checkbox in the header to set/unset all checkboxes in a column
+			if ( $( this ).children( 'thead' ).find( 'input[type="checkbox"]' ) ) {
+				$( this )
+				.off( namespace )
+				.on( 'tablesorter-ready' + namespace, function() {
+					var checkboxClass, $rows, len,
+						$table = $( this ),
+						c = $table.length && $table[ 0 ].config;
+					if ( !$.isEmptyObject( c ) ) {
+						this.tablesorterBusy = true;
+						checkboxClass = c && c.checkboxClass || 'checked';
+						$rows = $table.children( 'tbody' ).children( ':visible' ); // (include child rows?)
+						len = $rows.length;
+						// set indeterminate state on header checkbox
+						$( this ).children( 'thead' ).find( 'input[type="checkbox"]' ).each( function() {
+							var column = $( this ).closest( 'td, th' ).attr( 'data-column' ),
+								vis = $rows.filter( '.' + checkboxClass + '-' + column ).length,
+								allChecked = vis === len;
+							if ( vis === 0 || allChecked ) {
+								this.checked = allChecked;
+								this.indeterminate = false;
+							} else {
+								this.indeterminate = true;
+							}
+						});
+						this.tablesorterBusy = false;
+					}
+				})
+				.children( 'thead' )
+				.off( namespace )
+				// modified from http://jsfiddle.net/abkNM/6163/
+				.on( 'change' + namespace, 'input[type="checkbox"]', function( event ) {
+					var undef, onlyVisible, column, $target,
+						$checkbox = $( this ),
+						$table = $checkbox.closest( 'table' ),
+						c = $table.length && $table[ 0 ].config,
+						isChecked = this.checked;
+					if ( $table.length && c && !$table[ 0 ].tablesorterBusy ) {
+						column = parseInt( $checkbox.closest( 'td, th' ).attr( 'data-column' ), 10 );
+						onlyVisible = $table.length && c.checkboxVisible;
+						$table[ 0 ].tablesorterBusy = true; // prevent "change" event from calling updateCell numerous times (see #971)
+						$target = $table
+							.children( 'tbody' )
+							.children( 'tr' + ( typeof onlyVisible === 'undefined' || onlyVisible === true ? ':visible' : '' ) )
+							.children( ':nth-child(' + ( column + 1 ) + ')' )
+							.find( 'input[type="checkbox"]' )
+							.prop( 'checked', isChecked );
+						$.tablesorter.update( c, undef, function() {
+							updateServer( event, $table, $target );
+							$table[ 0 ].tablesorterBusy = false;
+						});
+					}
+					// update already going on, don't do anything!
+					return false;
+				});
+			}
+
 		});
 	});
 

data/vendor/assets/javascripts/jquery-tablesorter/widgets/widget-filter-type-insideRange.js

@@ -1,4 +1,4 @@
-/*! Widget: filter, insideRange filter type - updated 2/23/2015 (v2.21.0) */
+/*! Widget: filter, insideRange filter type - updated 11/22/2015 (v2.24.6) */
 ;(function($){
 	'use strict';
 
@@ -17,6 +17,8 @@
 	ts.filter.types.insideRange = function( c, data ) {
 		if ( isDigit.test( data.iFilter ) && range.test( data.iExact ) ) {
 			var t, val, low, high,
+				index = data.index,
+				cell = data.$cells[ index ],
 				parts = data.iExact.split( range ),
 				format = c.parsers[data.index].format;
 			// the cell does not contain a range
@@ -24,9 +26,9 @@
 				return null;
 			}
 			// format each side part of the range using the assigned parser
-			low = parseNumber( format( parts[0], c.table ) );
-			high = parseNumber( format( parts[1], c.table ) );
-			val = parseNumber( format( data.iFilter, c.table ) );
+			low = parseNumber( format( parts[0], c.table, cell, index ) );
+			high = parseNumber( format( parts[1], c.table, cell, index ) );
+			val = parseNumber( format( data.iFilter, c.table, cell, index ) );
 			if ( high < low ) {
 				// swap high & low
 				t = high; high = low; low = t;

data/vendor/assets/javascripts/jquery-tablesorter/widgets/widget-math.js

@@ -1,4 +1,4 @@
-/*! Widget: math - updated 11/10/2015 (v2.24.4) *//*
+/*! Widget: math - updated 11/22/2015 (v2.24.6) *//*
 * Requires tablesorter v2.16+ and jQuery 1.7+
 * by Rob Garrison
 */
@@ -40,11 +40,17 @@
 
 		// get all of the row numerical values in an arry
 		getRow : function( c, $el ) {
-			var wo = c.widgetOptions,
+			var $cells,
+				wo = c.widgetOptions,
 				arry = [],
 				$row = $el.closest( 'tr' ),
+				isFiltered = $row.hasClass( wo.filter_filteredRow || 'filtered' ),
+				hasFilter = wo.math_rowFilter;
+			if ( hasFilter ) {
+				$row = $row.filter( hasFilter );
+			}
+			if ( !isFiltered || hasFilter ) {
 				$cells = $row.children().not( '[' + wo.math_dataAttrib + '=ignore]' );
-			if ( !$row.hasClass( wo.filter_filteredRow || 'filtered' ) ) {
 				if ( wo.math_ignore.length ) {
 					$cells = $cells.not( '[data-column=' + wo.math_ignore.join( '],[data-column=' ) + ']' );
 				}
@@ -57,9 +63,10 @@
 
 		// get all of the column numerical values in an arry
 		getColumn : function( c, $el, type ) {
-			var index, $t, len, $mathRows, mathAbove,
+			var index, $t, $tr, len, $mathRows, mathAbove,
 				arry = [],
 				wo = c.widgetOptions,
+				hasFilter = wo.math_rowFilter,
 				mathAttr = wo.math_dataAttrib,
 				filtered = wo.filter_filteredRow || 'filtered',
 				cIndex = parseInt( $el.attr( 'data-column' ), 10 ),
@@ -71,11 +78,15 @@
 				len = $rows.index( $row );
 				index = len;
 				while ( index >= 0 ) {
-					$t = $rows.eq( index ).children().filter( '[data-column=' + cIndex + ']' );
+					$tr = $rows.eq( index );
+					if ( hasFilter ) {
+						$tr = $tr.filter( wo.math_rowFilter );
+					}
+					$t = $tr.children().filter( '[data-column=' + cIndex + ']' );
 					mathAbove = $t.filter( '[' + mathAttr + '^=above]' ).length;
 					// ignore filtered rows & rows with data-math="ignore" (and starting row)
-					if ( ( !$rows.eq( index ).hasClass( filtered ) &&
-							$rows.eq( index ).not( '[' + mathAttr + '=ignore]' ).length &&
+					if ( ( ( !$tr.hasClass( filtered ) || hasFilter ) &&
+							$tr.not( '[' + mathAttr + '=ignore]' ).length &&
 							index !== len ) ||
 							mathAbove && index !== len ) {
 						// stop calculating 'above', when encountering another 'above'
@@ -91,12 +102,16 @@
 				len = $rows.length;
 				// index + 1 to ignore starting node
 				for ( index = $rows.index( $row ) + 1; index < len; index++ ) {
-					$t = $rows.eq( index ).children().filter( '[data-column=' + cIndex + ']' );
+					$tr = $rows.eq( index );
+					if ( hasFilter ) {
+						$tr = $tr.filter( hasFilter );
+					}
+					$t = $tr.children().filter( '[data-column=' + cIndex + ']' );
 					if ( $t.filter( '[' + mathAttr + '^=below]' ).length ) {
 						break;
 					}
-					if ( !$rows.eq( index ).hasClass( filtered ) &&
-							$rows.eq( index ).not( '[' + mathAttr + '=ignore]' ).length &&
+					if ( ( !$tr.hasClass( filtered ) || hasFilter ) &&
+							$tr.not( '[' + mathAttr + '=ignore]' ).length &&
 							$t.length ) {
 						arry.push( math.processText( c, $t ) );
 					}
@@ -106,8 +121,12 @@
 				$mathRows = $rows.not( '[' + mathAttr + '=ignore]' );
 				len = $mathRows.length;
 				for ( index = 0; index < len; index++ ) {
-					$t = $mathRows.eq( index ).children().filter( '[data-column=' + cIndex + ']' );
-					if ( !$mathRows.eq( index ).hasClass( filtered ) &&
+					$tr = $mathRows.eq( index );
+					if ( hasFilter ) {
+						$tr = $tr.filter( hasFilter );
+					}
+					$t = $tr.children().filter( '[data-column=' + cIndex + ']' );
+					if ( ( !$tr.hasClass( filtered ) || hasFilter ) &&
 						$t.not( '[' + mathAttr + '^=above],[' + mathAttr + '^=below],[' + mathAttr + '^=col]' ).length &&
 						!$t.is( $el ) ) {
 						arry.push( math.processText( c, $t ) );
@@ -124,11 +143,15 @@
 				wo = c.widgetOptions,
 				mathAttr = wo.math_dataAttrib,
 				filtered = wo.filter_filteredRow || 'filtered',
+				hasFilter = wo.filter_rowFilter,
 				$rows = c.$table.children( 'tbody' ).children().not( '[' + mathAttr + '=ignore]' );
 			rowLen = $rows.length;
 			for ( rowIndex = 0; rowIndex < rowLen; rowIndex++ ) {
 				$row = $rows.eq( rowIndex );
-				if ( !$row.hasClass( filtered ) ) {
+				if ( hasFilter ) {
+					$row = $row.filter( hasFilter );
+				}
+				if ( !$row.hasClass( filtered ) || hasFilter ) {
 					$cells = $row.children().not( '[' + mathAttr + '=ignore]' );
 					cellLen = $cells.length;
 					// $row.children().each(function(){
@@ -157,7 +180,7 @@
 		recalculate : function(c, wo, init) {
 			if ( c && ( !wo.math_isUpdating || init ) ) {
 
-				var time, mathAttr, $mathCells;
+				var undef, time, mathAttr, $mathCells;
 				if ( c.debug ) {
 					time = new Date();
 				}
@@ -192,7 +215,9 @@
 				}
 
 				// update internal cache
-				ts.update( c );
+				ts.update( c, undef, function(){
+					math.updateComplete( c );
+				});
 
 				if ( c.debug ) {
 					console.log( 'Math widget update completed' + ts.benchmark( time ) );
@@ -200,6 +225,12 @@
 			}
 		},
 
+		updateComplete : function( c ) {
+			var wo = c.widgetOptions;
+			if ( wo.math_isUpdating && c.debug && console.groupEnd ) { console.groupEnd(); }
+			wo.math_isUpdating = false;
+		},
+
 		mathType : function( c, $cells, priority ) {
 			if ( $cells.length ) {
 				var formula, result, $el, arry, getAll, $targetCells, index, len,
@@ -488,7 +519,9 @@
 			math_suffix   : '',
 			// no matching math elements found (text added to cell)
 			math_none     : 'N/A',
-			math_event    : 'recalculate'
+			math_event    : 'recalculate',
+			// use this filter to target specific rows (e.g. ':visible', or ':not(.empty-row)')
+			math_rowFilter: ''
 		},
 		init : function( table, thisWidget, c, wo ) {
 			// filterEnd fires after updateComplete
@@ -507,8 +540,7 @@
 				})
 				.on( update + '.tsmath', function() {
 					setTimeout( function(){
-						if ( wo.math_isUpdating && c.debug && console.groupEnd ) { console.groupEnd(); }
-						wo.math_isUpdating = false;
+						math.updateComplete( c );
 					}, 40 );
 				});
 			wo.math_isUpdating = false;

data/vendor/assets/javascripts/jquery-tablesorter/widgets/widget-pager.js

@@ -1,4 +1,4 @@
-/*! Widget: Pager - updated 11/10/2015 (v2.24.4) */
+/*! Widget: Pager - updated 11/22/2015 (v2.24.6) */
 /* Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -11,9 +11,10 @@
 	ts.addWidget({
 		id: 'pager',
 		priority: 55, // load pager after filter widget
-		options : {
+		options: {
 			// output default: '{page}/{totalPages}'
-			// possible variables: {size}, {page}, {totalPages}, {filteredPages}, {startRow}, {endRow}, {filteredRows} and {totalRows}
+			// possible variables: {size}, {page}, {totalPages}, {filteredPages}, {startRow},
+			// {endRow}, {filteredRows} and {totalRows}
 			pager_output: '{startRow} to {endRow} of {totalRows} rows', // '{page}/{totalPages}'
 
 			// apply disabled classname to the pager arrows when the rows at either extreme is visible
@@ -32,14 +33,15 @@
 			// Number of options to include in the pager number selector
 			pager_maxOptionSize: 20,
 
-			// Save pager page & size if the storage script is loaded (requires $.tablesorter.storage in jquery.tablesorter.widgets.js)
+			// Save pager page & size if the storage script is loaded (requires $.tablesorter.storage
+			// in jquery.tablesorter.widgets.js)
 			pager_savePages: true,
 
 			// defines custom storage key
 			pager_storageKey: 'tablesorter-pager',
 
-			// if true, the table will remain the same height no matter how many records are displayed. The space is made up by an empty
-			// table row set to a height to compensate; default is false
+			// if true, the table will remain the same height no matter how many records are displayed.
+			// The space is made up by an empty table row set to a height to compensate; default is false
 			pager_fixedHeight: false,
 
 			// count child rows towards the set page size? (set true if it is a visible table row within the pager)
@@ -48,7 +50,8 @@
 			pager_countChildRows: false,
 
 			// remove rows from the table to speed up the sort of large tables.
-			// setting this to false, only hides the non-visible rows; needed if you plan to add/remove rows with the pager enabled.
+			// setting this to false, only hides the non-visible rows; needed if you plan to add/remove rows with
+			// the pager enabled.
 			pager_removeRows: false, // removing rows in larger tables speeds up the sort
 
 			// use this format: 'http://mydatabase.com?page={page}&size={size}&{sortList:col}&{filterList:fcol}'
@@ -60,7 +63,7 @@
 			pager_ajaxUrl: null,
 
 			// modify the url after all processing has been applied
-			pager_customAjaxUrl: function(table, url) { return url; },
+			pager_customAjaxUrl: function( table, url ) { return url; },
 
 			// ajax error callback from $.tablesorter.showError function
 			// pager_ajaxError: function( config, xhr, settings, exception ){ return exception; };
@@ -88,13 +91,15 @@
 			//   ],
 			//   [ "header1", "header2", ... "headerN" ] // optional
 			// ]
-			pager_ajaxProcessing: function(ajax){ return [ 0, [], null ]; },
+			pager_ajaxProcessing: function( ajax ){ return [ 0, [], null ]; },
 
 			// css class names of pager arrows
 			pager_css: {
 				container   : 'tablesorter-pager',
-				errorRow    : 'tablesorter-errorRow', // error information row (don't include period at beginning)
-				disabled    : 'disabled'              // class added to arrows @ extremes (i.e. prev/first arrows 'disabled' on first page)
+				// error information row (don't include period at beginning)
+				errorRow    : 'tablesorter-errorRow',
+				// class added to arrows @ extremes (i.e. prev/first arrows 'disabled' on first page)
+				disabled    : 'disabled'
 			},
 
 			// jQuery selectors
@@ -109,27 +114,27 @@
 				pageSize    : '.pagesize'     // page size selector - select dropdown that sets the 'size' option
 			}
 		},
-		init: function(table){
-			tsp.init(table);
+		init: function( table ) {
+			tsp.init( table );
 		},
 		// only update to complete sorter initialization
-		format: function(table, c){
-			if (!(c.pager && c.pager.initialized)){
-				return tsp.initComplete(table, c);
+		format: function( table, c ) {
+			if ( !( c.pager && c.pager.initialized ) ) {
+				return tsp.initComplete( c );
 			}
-			tsp.moveToPage(table, c.pager, false);
+			tsp.moveToPage( c, c.pager, false );
 		},
-		remove: function(table, c, wo, refreshing){
-			tsp.destroyPager(table, c, refreshing);
+		remove: function( table, c, wo, refreshing ) {
+			tsp.destroyPager( c, refreshing );
 		}
 	});
 
 	/* pager widget functions */
 	tsp = ts.pager = {
 
-		init: function(table) {
+		init: function( table ) {
 			// check if tablesorter has initialized
-			if (table.hasInitialized && table.config.pager && table.config.pager.initialized) { return; }
+			if ( table.hasInitialized && table.config.pager && table.config.pager.initialized ) { return; }
 			var t,
 				c = table.config,
 				wo = c.widgetOptions,
@@ -150,55 +155,60 @@
 					// save original pager size
 					setSize: wo.pager_size,
 					setPage: wo.pager_startPage
-				}, c.pager);
+				}, c.pager );
 
 			// pager initializes multiple times before table has completed initialization
-			if (p.isInitializing) { return; }
+			if ( p.isInitializing ) { return; }
 
 			p.isInitializing = true;
-			if (c.debug) {
-				console.log('Pager: Initializing');
+			if ( c.debug ) {
+				console.log( 'Pager: Initializing' );
 			}
 
-			p.size = $.data(table, 'pagerLastSize') || wo.pager_size;
+			p.size = $.data( table, 'pagerLastSize' ) || wo.pager_size;
 			// added in case the pager is reinitialized after being destroyed.
-			p.$container = $(s.container).addClass(wo.pager_css.container).show();
+			p.$container = $( s.container ).addClass( wo.pager_css.container ).show();
 			// goto selector
-			p.$goto = p.$container.find(s.gotoPage); // goto is a reserved word #657
+			p.$goto = p.$container.find( s.gotoPage ); // goto is a reserved word #657
 			// page size selector
-			p.$size = p.$container.find(s.pageSize);
-			p.totalRows = c.$tbodies.eq(0).children('tr').not( wo.pager_countChildRows ? '' : '.' + c.cssChildRow ).length;
+			p.$size = p.$container.find( s.pageSize );
+			p.totalRows = c.$tbodies.eq( 0 )
+				.children( 'tr' )
+				.not( wo.pager_countChildRows ? '' : '.' + c.cssChildRow )
+				.length;
 			p.oldAjaxSuccess = p.oldAjaxSuccess || wo.pager_ajaxObject.success;
 			c.appender = tsp.appender;
 			p.initializing = true;
-			if (wo.pager_savePages && ts.storage) {
-				t = ts.storage(table, wo.pager_storageKey) || {}; // fixes #387
-				p.page = ( isNaN(t.page) ? p.page : t.page ) || p.setPage || 0;
-				p.size = ( isNaN(t.size) ? p.size : t.size ) || p.setSize || 10;
-				$.data(table, 'pagerLastSize', p.size);
+			if ( wo.pager_savePages && ts.storage ) {
+				t = ts.storage( table, wo.pager_storageKey ) || {}; // fixes #387
+				p.page = ( isNaN( t.page ) ? p.page : t.page ) || p.setPage || 0;
+				p.size = ( isNaN( t.size ) ? p.size : t.size ) || p.setSize || 10;
+				$.data( table, 'pagerLastSize', p.size );
 			}
 
 			// skipped rows
-			p.regexRows = new RegExp('(' + (wo.filter_filteredRow || 'filtered') + '|' + c.selectorRemove.slice(1) + '|' + c.cssChildRow + ')');
+			p.regexRows = new RegExp( '(' + ( wo.filter_filteredRow || 'filtered' ) + '|' +
+				c.selectorRemove.slice( 1 ) + '|' + c.cssChildRow + ')' );
 
 			// clear initialized flag
 			p.initialized = false;
 			// before initialization event
-			c.$table.trigger('pagerBeforeInitialized', c);
+			c.$table.trigger( 'pagerBeforeInitialized', c );
 
-			tsp.enablePager(table, c, false);
+			tsp.enablePager( c, false );
 
 			// p must have ajaxObject
-			p.ajaxObject = wo.pager_ajaxObject; // $.extend({}, wo.pager_ajaxObject );
+			p.ajaxObject = wo.pager_ajaxObject;
 			p.ajaxObject.url = wo.pager_ajaxUrl;
 
 			if ( typeof wo.pager_ajaxUrl === 'string' ) {
 				// ajax pager; interact with database
 				p.ajax = true;
-				// When filtering with ajax, allow only custom filtering function, disable default filtering since it will be done server side.
+				// When filtering with ajax, allow only custom filtering function, disable default filtering
+				// since it will be done server side.
 				wo.filter_serversideFiltering = true;
 				c.serverSideSorting = true;
-				tsp.moveToPage(table, p);
+				tsp.moveToPage( c, p );
 			} else {
 				p.ajax = false;
 				// Regular pager; all rows stored in memory
@@ -207,30 +217,30 @@
 
 		},
 
-		initComplete: function(table, c){
+		initComplete: function( c ) {
 			var p = c.pager;
-			tsp.bindEvents(table, c);
-			tsp.setPageSize(c, 0); // page size 0 is ignored
-			if (!p.ajax) {
-				tsp.hideRowsSetup(table, c);
+			tsp.bindEvents( c );
+			tsp.setPageSize( c, 0 ); // page size 0 is ignored
+			if ( !p.ajax ) {
+				tsp.hideRowsSetup( c );
 			}
 
 			// pager initialized
 			p.initialized = true;
 			p.initializing = false;
 			p.isInitializing = false;
-			if (c.debug) {
-				console.log('Pager: Triggering pagerInitialized');
+			if ( c.debug ) {
+				console.log( 'Pager: Triggering pagerInitialized' );
 			}
 			c.$table.trigger( 'pagerInitialized', c );
 			// filter widget not initialized; it will update the output display & fire off the pagerComplete event
-			if ( !( c.widgetOptions.filter_initialized && ts.hasWidget(table, 'filter') ) ) {
+			if ( !( c.widgetOptions.filter_initialized && ts.hasWidget( c.table, 'filter' ) ) ) {
 				// if ajax, then don't fire off pagerComplete
-				tsp.updatePageDisplay(table, c, !p.ajax);
+				tsp.updatePageDisplay( c, !p.ajax );
 			}
 		},
 
-		bindEvents: function(table, c){
+		bindEvents: function( c ) {
 			var ctrls, fxn,
 				p = c.pager,
 				wo = c.widgetOptions,
@@ -239,106 +249,108 @@
 
 			c.$table
 				.off( namespace )
-				.on('filterInit filterStart '.split(' ').join(namespace + ' '), function(e, filters) {
-					p.currentFilters = $.isArray(filters) ? filters : c.$table.data('lastSearch');
+				.on( 'filterInit filterStart '.split( ' ' ).join( namespace + ' ' ), function( e, filters ) {
+					p.currentFilters = $.isArray( filters ) ? filters : c.$table.data( 'lastSearch' );
 					// don't change page if filters are the same (pager updating, etc)
-					if (e.type === 'filterStart' && wo.pager_pageReset !== false && (c.lastCombinedFilter || '') !== (p.currentFilters || []).join('')) {
+					if ( e.type === 'filterStart' && wo.pager_pageReset !== false &&
+						( c.lastCombinedFilter || '' ) !== ( p.currentFilters || [] ).join( '' ) ) {
 						p.page = wo.pager_pageReset; // fixes #456 & #565
 					}
 				})
 				// update pager after filter widget completes
-				.on('filterEnd sortEnd '.split(' ').join(namespace + ' '), function() {
-					p.currentFilters = c.$table.data('lastSearch');
-					if (p.initialized || p.initializing) {
-						if (c.delayInit && c.rowsCopy && c.rowsCopy.length === 0) {
+				.on( 'filterEnd sortEnd '.split( ' ' ).join( namespace + ' ' ), function() {
+					p.currentFilters = c.$table.data( 'lastSearch' );
+					if ( p.initialized || p.initializing ) {
+						if ( c.delayInit && c.rowsCopy && c.rowsCopy.length === 0 ) {
 							// make sure we have a copy of all table rows once the cache has been built
-							tsp.updateCache(table);
+							tsp.updateCache( c );
 						}
-						tsp.updatePageDisplay(table, c, false);
-						// tsp.moveToPage(table, p, false); <-- called when applyWidgets is triggered
-						ts.applyWidget( table );
+						tsp.updatePageDisplay( c, false );
+						// tsp.moveToPage( c, p, false ); <-- called when applyWidgets is triggered
+						ts.applyWidget( c.table );
 					}
 				})
-				.on('disablePager' + namespace, function(e){
+				.on( 'disablePager' + namespace, function( e ) {
 					e.stopPropagation();
-					tsp.showAllRows(table, c);
+					tsp.showAllRows( c );
 				})
-				.on('enablePager' + namespace, function(e){
+				.on( 'enablePager' + namespace, function( e ) {
 					e.stopPropagation();
-					tsp.enablePager(table, c, true);
+					tsp.enablePager( c, true );
 				})
-				.on('destroyPager' + namespace, function(e, refreshing){
+				.on( 'destroyPager' + namespace, function( e, refreshing ) {
 					e.stopPropagation();
 					// call removeWidget to make sure internal flags are modified.
-					ts.removeWidget( table, 'pager', false );
+					ts.removeWidget( c.table, 'pager', false );
 				})
-				.on('updateComplete' + namespace, function(e, table, triggered){
+				.on( 'updateComplete' + namespace, function( e, table, triggered ) {
 					e.stopPropagation();
 					// table can be unintentionally undefined in tablesorter v2.17.7 and earlier
 					// don't recalculate total rows/pages if using ajax
-					if (!table || triggered || p.ajax) { return; }
-					var $rows = c.$tbodies.eq(0).children('tr').not(c.selectorRemove);
-					p.totalRows = $rows.length - ( wo.pager_countChildRows ? 0 : $rows.filter('.' + c.cssChildRow).length );
+					if ( !table || triggered || p.ajax ) { return; }
+					var $rows = c.$tbodies.eq( 0 ).children( 'tr' ).not( c.selectorRemove );
+					p.totalRows = $rows.length -
+						( wo.pager_countChildRows ? 0 : $rows.filter( '.' + c.cssChildRow ).length );
 					p.totalPages = Math.ceil( p.totalRows / p.size );
-					if ($rows.length && c.rowsCopy && c.rowsCopy.length === 0) {
+					if ( $rows.length && c.rowsCopy && c.rowsCopy.length === 0 ) {
 						// make a copy of all table rows once the cache has been built
-						tsp.updateCache(table);
+						tsp.updateCache( c );
 					}
 					if ( p.page >= p.totalPages ) {
-						tsp.moveToLastPage(table, p);
+						tsp.moveToLastPage( c, p );
 					}
-					tsp.hideRows(table, c);
-					tsp.changeHeight(table, c);
+					tsp.hideRows( c );
+					tsp.changeHeight( c );
 					// update without triggering pagerComplete
-					tsp.updatePageDisplay(table, c, false);
+					tsp.updatePageDisplay( c, false );
 					// make sure widgets are applied - fixes #450
 					ts.applyWidget( table );
-					tsp.updatePageDisplay(table, c);
+					tsp.updatePageDisplay( c );
 				})
-				.on('pageSize refreshComplete '.split(' ').join(namespace + ' '), function(e, size){
+				.on( 'pageSize refreshComplete '.split( ' ' ).join( namespace + ' ' ), function( e, size ) {
 					e.stopPropagation();
-					tsp.setPageSize(c, tsp.parsePageSize( c, size, 'get' ));
-					tsp.hideRows(table, c);
-					tsp.updatePageDisplay(table, c, false);
+					tsp.setPageSize( c, tsp.parsePageSize( c, size, 'get' ) );
+					tsp.hideRows( c );
+					tsp.updatePageDisplay( c, false );
 				})
-				.on('pageSet pagerUpdate '.split(' ').join(namespace + ' '), function(e, num){
+				.on( 'pageSet pagerUpdate '.split( ' ' ).join( namespace + ' ' ), function( e, num ) {
 					e.stopPropagation();
 					// force pager refresh
-					if (e.type === 'pagerUpdate') {
+					if ( e.type === 'pagerUpdate' ) {
 						num = typeof num === 'undefined' ? p.page + 1 : num;
 						p.last.page = true;
 					}
-					p.page = (parseInt(num, 10) || 1) - 1;
-					tsp.moveToPage(table, p, true);
-					tsp.updatePageDisplay(table, c, false);
+					p.page = ( parseInt( num, 10 ) || 1 ) - 1;
+					tsp.moveToPage( c, p, true );
+					tsp.updatePageDisplay( c, false );
 				})
-				.on('pageAndSize' + namespace, function(e, page, size){
+				.on( 'pageAndSize' + namespace, function( e, page, size ) {
 					e.stopPropagation();
-					p.page = (parseInt(page, 10) || 1) - 1;
-					tsp.setPageSize(c, tsp.parsePageSize( c, size, 'get' ));
-					tsp.moveToPage(table, p, true);
-					tsp.hideRows(table, c);
-					tsp.updatePageDisplay(table, c, false);
+					p.page = ( parseInt(page, 10) || 1 ) - 1;
+					tsp.setPageSize( c, tsp.parsePageSize( c, size, 'get' ) );
+					tsp.moveToPage( c, p, true );
+					tsp.hideRows( c );
+					tsp.updatePageDisplay( c, false );
 				});
 
 			// clicked controls
 			ctrls = [ s.first, s.prev, s.next, s.last ];
 			fxn = [ 'moveToFirstPage', 'moveToPrevPage', 'moveToNextPage', 'moveToLastPage' ];
-			if (c.debug && !p.$container.length) {
-				console.warn('Pager: >> Container not found');
+			if ( c.debug && !p.$container.length ) {
+				console.warn( 'Pager: >> Container not found' );
 			}
-			p.$container.find(ctrls.join(','))
-				.attr('tabindex', 0)
-				.off('click' + namespace)
-				.on('click' + namespace, function(e){
+			p.$container.find( ctrls.join( ',' ) )
+				.attr( 'tabindex', 0 )
+				.off( 'click' + namespace )
+				.on( 'click' + namespace, function( e ) {
 					e.stopPropagation();
 					var i,
-						$c = $(this),
+						$c = $( this ),
 						l = ctrls.length;
-					if ( !$c.hasClass(wo.pager_css.disabled) ) {
-						for (i = 0; i < l; i++) {
-							if ($c.is(ctrls[i])) {
-								tsp[fxn[i]](table, p);
+					if ( !$c.hasClass( wo.pager_css.disabled ) ) {
+						for ( i = 0; i < l; i++ ) {
+							if ( $c.is( ctrls[ i ] ) ) {
+								tsp[ fxn[ i ] ]( c, p );
 								break;
 							}
 						}
@@ -347,145 +359,165 @@
 
 			if ( p.$goto.length ) {
 				p.$goto
-					.off('change' + namespace)
-					.on('change' + namespace, function(){
-						p.page = $(this).val() - 1;
-						tsp.moveToPage(table, p, true);
-						tsp.updatePageDisplay(table, c, false);
+					.off( 'change' + namespace )
+					.on( 'change' + namespace, function() {
+						p.page = $( this ).val() - 1;
+						tsp.moveToPage( c, p, true );
+						tsp.updatePageDisplay( c, false );
 					});
-			} else if (c.debug) {
-				console.warn('Pager: >> Goto selector not found');
+			} else if ( c.debug ) {
+				console.warn( 'Pager: >> Goto selector not found' );
 			}
 
 			if ( p.$size.length ) {
 				// setting an option as selected appears to cause issues with initial page size
-				p.$size.find('option').removeAttr('selected');
+				p.$size.find( 'option' ).removeAttr( 'selected' );
 				p.$size
-					.off('change' + namespace)
-					.on('change' + namespace, function() {
-						if ( !$(this).hasClass(wo.pager_css.disabled) ) {
-							var size = $(this).val();
+					.off( 'change' + namespace )
+					.on( 'change' + namespace, function() {
+						if ( !$( this ).hasClass( wo.pager_css.disabled ) ) {
+							var size = $( this ).val();
 							p.$size.val( size ); // in case there are more than one pagers
-							tsp.setPageSize(c, size);
-							tsp.changeHeight(table, c);
+							tsp.setPageSize( c, size );
+							tsp.changeHeight( c );
 						}
 						return false;
 					});
-			} else if (c.debug) {
+			} else if ( c.debug ) {
 				console.warn('Pager: >> Size selector not found');
 			}
 
 		},
 
 		// hide arrows at extremes
-		pagerArrows: function(c, disable) {
+		pagerArrows: function( c, disable ) {
 			var p = c.pager,
 				dis = !!disable,
 				first = dis || p.page === 0,
-				tp = Math.min( p.totalPages, p.filteredPages ),
+				tp = tsp.getTotalPages( c, p ),
 				last = dis || p.page === tp - 1 || tp === 0,
 				wo = c.widgetOptions,
 				s = wo.pager_selectors;
 			if ( wo.pager_updateArrows ) {
-				p.$container.find(s.first + ',' + s.prev).toggleClass(wo.pager_css.disabled, first).attr('aria-disabled', first);
-				p.$container.find(s.next + ',' + s.last).toggleClass(wo.pager_css.disabled, last).attr('aria-disabled', last);
+				p.$container
+					.find( s.first + ',' + s.prev )
+					.toggleClass( wo.pager_css.disabled, first )
+					.attr( 'aria-disabled', first );
+				p.$container
+					.find( s.next + ',' + s.last )
+					.toggleClass( wo.pager_css.disabled, last )
+					.attr( 'aria-disabled', last );
 			}
 		},
 
-		calcFilters: function(table, c) {
+		calcFilters: function( c ) {
 			var normalized, indx, len,
 				wo = c.widgetOptions,
 				p = c.pager,
-				hasFilters = c.$table.hasClass('hasFilters');
-			if (hasFilters && !wo.pager_ajaxUrl) {
-				if ($.isEmptyObject(c.cache)) {
+				hasFilters = c.$table.hasClass( 'hasFilters' );
+			if ( hasFilters && !wo.pager_ajaxUrl ) {
+				if ( $.isEmptyObject( c.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 {
 					p.filteredRows = 0;
-					normalized = c.cache[0].normalized;
+					normalized = c.cache[ 0 ].normalized;
 					len = normalized.length;
-					for (indx = 0; indx < len; indx++) {
-						p.filteredRows += p.regexRows.test(normalized[indx][c.columns].$row[0].className) ? 0 : 1;
+					for ( indx = 0; indx < len; indx++ ) {
+						p.filteredRows += p.regexRows.test( normalized[ indx ][ c.columns ].$row[ 0 ].className ) ? 0 : 1;
 					}
 				}
-			} else if (!hasFilters) {
+			} else if ( !hasFilters ) {
 				p.filteredRows = p.totalRows;
 			}
 		},
 
-		updatePageDisplay: function(table, c, completed) {
+		updatePageDisplay: function( c, completed ) {
 			if ( c.pager.initializing ) { return; }
 			var s, t, $out, options, indx, len,
+				table = c.table,
 				wo = c.widgetOptions,
 				p = c.pager,
 				namespace = c.namespace + 'pager',
 				sz = tsp.parsePageSize( c, p.size, 'get' ); // don't allow dividing by zero
-			if (wo.pager_countChildRows) { t.push(c.cssChildRow); }
-			p.$size.add(p.$goto).removeClass(wo.pager_css.disabled).removeAttr('disabled').attr('aria-disabled', 'false');
+			if ( wo.pager_countChildRows ) { t.push( c.cssChildRow ); }
+			p.$size
+				.add( p.$goto )
+				.removeClass( wo.pager_css.disabled )
+				.removeAttr( 'disabled' )
+				.attr( 'aria-disabled', 'false' );
 			p.totalPages = Math.ceil( p.totalRows / sz ); // needed for 'pageSize' method
 			c.totalRows = p.totalRows;
-			tsp.parsePageNumber( p );
-			tsp.calcFilters(table, c);
+			tsp.parsePageNumber( c, p );
+			tsp.calcFilters( c );
 			c.filteredRows = p.filteredRows;
 			p.filteredPages = Math.ceil( p.filteredRows / sz ) || 0;
-			if ( Math.min( p.totalPages, p.filteredPages ) >= 0 ) {
-				t = (p.size * p.page > p.filteredRows) && completed;
-				p.page = (t) ? wo.pager_pageReset || 0 : p.page;
-				p.startRow = (t) ? p.size * p.page + 1 : (p.filteredRows === 0 ? 0 : p.size * p.page + 1);
+			if ( tsp.getTotalPages( c, p ) >= 0 ) {
+				t = ( p.size * p.page > p.filteredRows ) && completed;
+				p.page = t ? wo.pager_pageReset || 0 : p.page;
+				p.startRow = t ? p.size * p.page + 1 : ( p.filteredRows === 0 ? 0 : p.size * p.page + 1 );
 				p.endRow = Math.min( p.filteredRows, p.totalRows, p.size * ( p.page + 1 ) );
-				$out = p.$container.find(wo.pager_selectors.pageDisplay);
+				$out = p.$container.find( wo.pager_selectors.pageDisplay );
 				// form the output string (can now get a new output string from the server)
 				s = ( p.ajaxData && p.ajaxData.output ? p.ajaxData.output || wo.pager_output : wo.pager_output )
 					// {page} = one-based index; {page+#} = zero based index +/- value
-					.replace(/\{page([\-+]\d+)?\}/gi, function(m, n){
-						return p.totalPages ? p.page + (n ? parseInt(n, 10) : 1) : 0;
+					.replace( /\{page([\-+]\d+)?\}/gi, function( m, n ) {
+						return p.totalPages ? p.page + ( n ? parseInt( n, 10 ) : 1 ) : 0;
 					})
 					// {totalPages}, {extra}, {extra:0} (array) or {extra : key} (object)
-					.replace(/\{\w+(\s*:\s*\w+)?\}/gi, function(m){
+					.replace( /\{\w+(\s*:\s*\w+)?\}/gi, function( m ) {
 						var len, indx,
-							str = m.replace(/[{}\s]/g, ''),
-							extra = str.split(':'),
+							str = m.replace( /[{}\s]/g, '' ),
+							extra = str.split( ':' ),
 							data = p.ajaxData,
 							// return zero for default page/row numbers
-							deflt = /(rows?|pages?)$/i.test(str) ? 0 : '';
-						if (/(startRow|page)/.test(extra[0]) && extra[1] === 'input') {
-							len = ('' + (extra[0] === 'page' ? p.totalPages : p.totalRows)).length;
-							indx = extra[0] === 'page' ? p.page + 1 : p.startRow;
-							return '<input type="text" class="ts-' + extra[0] + '" style="max-width:' + len + 'em" value="' + indx + '"/>';
+							deflt = /(rows?|pages?)$/i.test( str ) ? 0 : '';
+						if ( /(startRow|page)/.test( extra[ 0 ] ) && extra[ 1 ] === 'input' ) {
+							len = ( '' + ( extra[ 0 ] === 'page' ? p.totalPages : p.totalRows ) ).length;
+							indx = extra[ 0 ] === 'page' ? p.page + 1 : p.startRow;
+							return '<input type="text" class="ts-' + extra[ 0 ] +
+								'" style="max-width:' + len + 'em" value="' + indx + '"/>';
 						}
-						return extra.length > 1 && data && data[extra[0]] ? data[extra[0]][extra[1]] : p[str] || (data ? data[str] : deflt) || deflt;
+						return extra.length > 1 && data && data[ extra[ 0 ] ] ?
+							data[ extra[ 0 ] ][ extra[ 1 ] ] :
+							p[ str ] || ( data ? data[ str ] : deflt ) || deflt;
 					});
 				if ( p.$goto.length ) {
 					t = '';
-					options = tsp.buildPageSelect(p, c);
+					options = tsp.buildPageSelect( c, p );
 					len = options.length;
-					for (indx = 0; indx < len; indx++) {
-						t += '<option value="' + options[indx] + '">' + options[indx] + '</option>';
+					for ( indx = 0; indx < len; indx++ ) {
+						t += '<option value="' + options[ indx ] + '">' + options[ indx ] + '</option>';
 					}
 					// innerHTML doesn't work in IE9 - http://support2.microsoft.com/kb/276228
-					p.$goto.html(t).val( p.page + 1 );
+					p.$goto.html( t ).val( p.page + 1 );
 				}
-				if ($out.length) {
-					$out[ ($out[0].nodeName === 'INPUT') ? 'val' : 'html' ](s);
+				if ( $out.length ) {
+					$out[ ($out[ 0 ].nodeName === 'INPUT' ) ? 'val' : 'html' ]( s );
 					// rebind startRow/page inputs
-					$out.find('.ts-startRow, .ts-page').off('change' + namespace).on('change' + namespace, function(){
-						var v = $(this).val(),
-							pg = $(this).hasClass('ts-startRow') ? Math.floor( v / p.size ) + 1 : v;
-						c.$table.trigger('pageSet' + namespace, [ pg ]);
-					});
+					$out
+						.find( '.ts-startRow, .ts-page' )
+						.off( 'change' + namespace )
+						.on( 'change' + namespace, function() {
+							var v = $( this ).val(),
+								pg = $( this ).hasClass( 'ts-startRow' ) ? Math.floor( v / p.size ) + 1 : v;
+							c.$table.trigger( 'pageSet' + namespace, [ pg ] );
+						});
 				}
 			}
-			tsp.pagerArrows(c);
-			tsp.fixHeight(table, c);
-			if (p.initialized && completed !== false) {
-				if (c.debug) {
-					console.log('Pager: Triggering pagerComplete');
+			tsp.pagerArrows( c );
+			tsp.fixHeight( c );
+			if ( p.initialized && completed !== false ) {
+				if ( c.debug ) {
+					console.log( 'Pager: Triggering pagerComplete' );
 				}
-				c.$table.trigger('pagerComplete', c);
+				c.$table.trigger( 'pagerComplete', c );
 				// save pager info to storage
-				if (wo.pager_savePages && ts.storage) {
-					ts.storage(table, wo.pager_storageKey, {
+				if ( wo.pager_savePages && ts.storage ) {
+					ts.storage( table, wo.pager_storageKey, {
 						page : p.page,
 						size : p.size
 					});
@@ -493,100 +525,107 @@
 			}
 		},
 
-		buildPageSelect: function(p, c) {
+		buildPageSelect: function( c, p ) {
 			// Filter the options page number link array if it's larger than 'pager_maxOptionSize'
 			// as large page set links will slow the browser on large dom inserts
-			var i, central_focus_size, focus_option_pages, insert_index, option_length, focus_length,
+			var i, centralFocusSize, focusOptionPages, insertIndex, optionLength, focusLength,
 				wo = c.widgetOptions,
-				pg = Math.min( p.totalPages, p.filteredPages ) || 1,
+				pg = tsp.getTotalPages( c, p ) || 1,
 				// make skip set size multiples of 5
-				skip_set_size = Math.ceil( ( pg / wo.pager_maxOptionSize ) / 5 ) * 5,
-				large_collection = pg > wo.pager_maxOptionSize,
-				current_page = p.page + 1,
-				start_page = skip_set_size,
-				end_page = pg - skip_set_size,
-				option_pages = [ 1 ],
+				skipSetSize = Math.ceil( ( pg / wo.pager_maxOptionSize ) / 5 ) * 5,
+				largeCollection = pg > wo.pager_maxOptionSize,
+				currentPage = p.page + 1,
+				startPage = skipSetSize,
+				endPage = pg - skipSetSize,
+				optionPages = [ 1 ],
 				// construct default options pages array
-				option_pages_start_page = (large_collection) ? skip_set_size : 1;
+				optionPagesStartPage = largeCollection ? skipSetSize : 1;
 
-			for ( i = option_pages_start_page; i <= pg; ) {
-				option_pages.push(i);
-				i = i + ( large_collection ? skip_set_size : 1 );
+			for ( i = optionPagesStartPage; i <= pg; ) {
+				optionPages.push( i );
+				i = i + ( largeCollection ? skipSetSize : 1 );
 			}
-			option_pages.push(pg);
+			optionPages.push( pg );
 
-			if (large_collection) {
-				focus_option_pages = [];
+			if ( largeCollection ) {
+				focusOptionPages = [];
 				// don't allow central focus size to be > 5 on either side of current page
-				central_focus_size = Math.max( Math.floor( wo.pager_maxOptionSize / skip_set_size ) - 1, 5 );
+				centralFocusSize = Math.max( Math.floor( wo.pager_maxOptionSize / skipSetSize ) - 1, 5 );
 
-				start_page = current_page - central_focus_size;
-				if (start_page < 1) { start_page = 1; }
-				end_page = current_page + central_focus_size;
-				if (end_page > pg) { end_page = pg; }
+				startPage = currentPage - centralFocusSize;
+				if ( startPage < 1 ) { startPage = 1; }
+				endPage = currentPage + centralFocusSize;
+				if ( endPage > pg ) { endPage = pg; }
 				// construct an array to get a focus set around the current page
-				for (i = start_page; i <= end_page ; i++) {
-					focus_option_pages.push(i);
+				for ( i = startPage; i <= endPage ; i++ ) {
+					focusOptionPages.push( i );
 				}
 
 				// keep unique values
-				option_pages = $.grep(option_pages, function(value, indx) {
-					return $.inArray(value, option_pages) === indx;
+				optionPages = $.grep( optionPages, function( value, indx ) {
+					return $.inArray( value, optionPages ) === indx;
 				});
 
-				option_length = option_pages.length;
-				focus_length = focus_option_pages.length;
+				optionLength = optionPages.length;
+				focusLength = focusOptionPages.length;
 
-				// make sure at all option_pages aren't replaced
-				if (option_length - focus_length > skip_set_size / 2 && option_length + focus_length > wo.pager_maxOptionSize ) {
-					insert_index = Math.floor(option_length / 2) - Math.floor(focus_length / 2);
-					Array.prototype.splice.apply(option_pages, [ insert_index, focus_length ]);
+				// make sure at all optionPages aren't replaced
+				if ( optionLength - focusLength > skipSetSize / 2 && optionLength + focusLength > wo.pager_maxOptionSize ) {
+					insertIndex = Math.floor( optionLength / 2 ) - Math.floor( focusLength / 2 );
+					Array.prototype.splice.apply( optionPages, [ insertIndex, focusLength ] );
 				}
-				option_pages = option_pages.concat(focus_option_pages);
+				optionPages = optionPages.concat( focusOptionPages );
 
 			}
 
 			// keep unique values again
-			option_pages = $.grep(option_pages, function(value, indx) {
-				return $.inArray(value, option_pages) === indx;
+			optionPages = $.grep( optionPages, function( value, indx ) {
+				return $.inArray( value, optionPages ) === indx;
 			})
-			.sort(function(a, b) { return a - b; });
+			.sort( function( a, b ) {
+				return a - b;
+			});
 
-			return option_pages;
+			return optionPages;
 		},
 
-		fixHeight: function(table, c) {
+		fixHeight: function( c ) {
 			var d, h,
+				table = c.table,
 				p = c.pager,
 				wo = c.widgetOptions,
-				$b = c.$tbodies.eq(0);
-			$b.find('tr.pagerSavedHeightSpacer').remove();
-			if (wo.pager_fixedHeight && !p.isDisabled) {
-				h = $.data(table, 'pagerSavedHeight');
-				if (h) {
+				$b = c.$tbodies.eq( 0 );
+			$b.find( 'tr.pagerSavedHeightSpacer' ).remove();
+			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 ) {
-						$b.append('<tr class="pagerSavedHeightSpacer ' + c.selectorRemove.slice(1) + '" style="height:' + d + 'px;"></tr>');
+					if ( d > 5 && $.data( table, 'pagerLastSize' ) === p.size && $b.children( 'tr:visible' ).length < p.size ) {
+						$b.append( '<tr class="pagerSavedHeightSpacer ' + c.selectorRemove.slice( 1 ) +
+							'" style="height:' + d + 'px;"></tr>' );
 					}
 				}
 			}
 		},
 
-		changeHeight: function(table, c) {
-			var h, $b = c.$tbodies.eq(0);
-			$b.find('tr.pagerSavedHeightSpacer').remove();
-			if (!$b.children('tr:visible').length) {
-				$b.append('<tr class="pagerSavedHeightSpacer ' + c.selectorRemove.slice(1) + '"><td>&nbsp</td></tr>');
+		changeHeight: function( c ) {
+			var h,
+				table = c.table,
+				$b = c.$tbodies.eq( 0 );
+			$b.find( 'tr.pagerSavedHeightSpacer' ).remove();
+			if ( !$b.children( 'tr:visible' ).length ) {
+				$b.append( '<tr class="pagerSavedHeightSpacer ' + c.selectorRemove.slice( 1 ) + '"><td>&nbsp</td></tr>' );
 			}
-			h = $b.children('tr').eq(0).height() * c.pager.size;
-			$.data(table, 'pagerSavedHeight', h);
-			tsp.fixHeight(table, c);
-			$.data(table, 'pagerLastSize', c.pager.size);
+			h = $b.children( 'tr' ).eq( 0 ).height() * c.pager.size;
+			$.data( table, 'pagerSavedHeight', h );
+			tsp.fixHeight( c );
+			$.data( table, 'pagerLastSize', c.pager.size );
 		},
 
-		hideRows: function(table, c){
+		hideRows: function( c ) {
 			if ( !c.widgetOptions.pager_ajaxUrl ) {
 				var tbodyIndex, rowIndex, $rows, len, lastIndex,
+					table = c.table,
 					p = c.pager,
 					wo = c.widgetOptions,
 					tbodyLen = c.$tbodies.length,
@@ -633,236 +672,239 @@
 			}
 		},
 
-		hideRowsSetup: function(table, c){
+		hideRowsSetup: function( c ) {
 			var p = c.pager,
 				namespace = c.namespace + 'pager',
 				size = p.$size.val();
 			p.size = tsp.parsePageSize( c, size, 'get' );
 			p.$size.val( tsp.parsePageSize( c, p.size, 'set' ) );
-			$.data(table, 'pagerLastSize', p.size);
-			tsp.pagerArrows(c);
+			$.data( c.table, 'pagerLastSize', p.size );
+			tsp.pagerArrows( c );
 			if ( !c.widgetOptions.pager_removeRows ) {
-				tsp.hideRows(table, c);
-				c.$table.on('sortEnd filterEnd '.split(' ').join(namespace + ' '), function(){
-					tsp.hideRows(table, c);
+				tsp.hideRows( c );
+				c.$table.on( 'sortEnd filterEnd '.split( ' ' ).join( namespace + ' ' ), function() {
+					tsp.hideRows( c );
 				});
 			}
 		},
 
-		renderAjax: function(data, table, c, xhr, settings, exception) {
-			var p = c.pager,
+		renderAjax: function( data, c, xhr, settings, exception ) {
+			var table = c.table,
+				p = c.pager,
 				wo = c.widgetOptions;
 			// process data
-			if ( $.isFunction(wo.pager_ajaxProcessing) ) {
+			if ( $.isFunction( wo.pager_ajaxProcessing ) ) {
 
 				// in case nothing is returned by ajax, empty out the table; see #1032
 				// but do it before calling pager_ajaxProcessing because that function may add content
 				// directly to the table
-				c.$tbodies.eq(0).empty();
+				c.$tbodies.eq( 0 ).empty();
 
 				// ajaxProcessing result: [ total, rows, headers ]
 				var i, j, t, hsh, $f, $sh, $headers, $h, icon, th, d, l, rr_count, len,
 					$table = c.$table,
 					tds = '',
-					result = wo.pager_ajaxProcessing(data, table, xhr) || [ 0, [] ],
-					hl = $table.find('thead th').length;
+					result = wo.pager_ajaxProcessing( data, table, xhr ) || [ 0, [] ],
+					hl = $table.find( 'thead th' ).length;
 
 				// Clean up any previous error.
 				ts.showError( table );
 
 				if ( exception ) {
-					if (c.debug) {
-						console.error('Pager: >> Ajax Error', xhr, settings, exception);
+					if ( c.debug ) {
+						console.error( 'Pager: >> Ajax Error', xhr, settings, exception );
 					}
 					ts.showError( table, xhr, settings, exception );
-					c.$tbodies.eq(0).children('tr').detach();
+					c.$tbodies.eq( 0 ).children( 'tr' ).detach();
 					p.totalRows = 0;
 				} else {
 					// process ajax object
-					if (!$.isArray(result)) {
+					if ( !$.isArray( result ) ) {
 						p.ajaxData = result;
 						c.totalRows = p.totalRows = result.total;
-						c.filteredRows = p.filteredRows = typeof result.filteredRows !== 'undefined' ? result.filteredRows : result.total;
+						c.filteredRows = p.filteredRows = typeof result.filteredRows !== 'undefined' ?
+							result.filteredRows :
+							result.total;
 						th = result.headers;
 						d = result.rows || [];
 					} else {
 						// allow [ total, rows, headers ]  or [ rows, total, headers ]
-						t = isNaN(result[0]) && !isNaN(result[1]);
+						t = isNaN( result[ 0 ] ) && !isNaN( result[ 1 ] );
 						// ensure a zero returned row count doesn't fail the logical ||
-						rr_count = result[t ? 1 : 0];
-						p.totalRows = isNaN(rr_count) ? p.totalRows || 0 : rr_count;
+						rr_count = result[ t ? 1 : 0 ];
+						p.totalRows = isNaN( rr_count ) ? p.totalRows || 0 : rr_count;
 						// can't set filtered rows when returning an array
 						c.totalRows = c.filteredRows = p.filteredRows = p.totalRows;
 						// set row data to empty array if nothing found - see http://stackoverflow.com/q/30875583/145346
-						d = p.totalRows === 0 ? [] : result[t ? 0 : 1] || []; // row data
-						th = result[2]; // headers
+						d = p.totalRows === 0 ? [] : result[ t ? 0 : 1 ] || []; // row data
+						th = result[ 2 ]; // headers
 					}
 					l = d && d.length;
-					if (d instanceof jQuery) {
-						if (wo.pager_processAjaxOnInit) {
+					if ( d instanceof jQuery ) {
+						if ( wo.pager_processAjaxOnInit ) {
 							// append jQuery object
-							c.$tbodies.eq(0).empty();
-							c.$tbodies.eq(0).append(d);
+							c.$tbodies.eq( 0 ).empty();
+							c.$tbodies.eq( 0 ).append( d );
 						}
-					} else if (l) {
+					} else if ( l ) {
 						// build table from array
 						for ( i = 0; i < l; i++ ) {
 							tds += '<tr>';
 							for ( j = 0; j < d[i].length; j++ ) {
 								// build tbody cells; watch for data containing HTML markup - see #434
-								tds += /^\s*<td/.test(d[i][j]) ? $.trim(d[i][j]) : '<td>' + d[i][j] + '</td>';
+								tds += /^\s*<td/.test( d[ i ][ j ] ) ? $.trim( d[ i ][ j ] ) : '<td>' + d[ i ][ j ] + '</td>';
 							}
 							tds += '</tr>';
 						}
 						// add rows to first tbody
-						if (wo.pager_processAjaxOnInit) {
-							c.$tbodies.eq(0).html( tds );
+						if ( wo.pager_processAjaxOnInit ) {
+							c.$tbodies.eq( 0 ).html( tds );
 						}
 					}
 					wo.pager_processAjaxOnInit = true;
 					// only add new header text if the length matches
 					if ( th && th.length === hl ) {
-						hsh = $table.hasClass('hasStickyHeaders');
-						$sh = hsh ? wo.$sticky.children('thead:first').children('tr').children() : '';
-						$f = $table.find('tfoot tr:first').children();
+						hsh = $table.hasClass( 'hasStickyHeaders' );
+						$sh = hsh ? wo.$sticky.children( 'thead:first' ).children( 'tr' ).children() : '';
+						$f = $table.find( 'tfoot tr:first' ).children();
 						// don't change td headers (may contain pager)
-						$headers = c.$headers.filter( 'th ');
+						$headers = c.$headers.filter( 'th' );
 						len = $headers.length;
 						for ( j = 0; j < len; j++ ) {
 							$h = $headers.eq( j );
 							// add new test within the first span it finds, or just in the header
-							if ( $h.find('.' + ts.css.icon).length ) {
-								icon = $h.find('.' + ts.css.icon).clone(true);
-								$h.find('.tablesorter-header-inner').html( th[j] ).append(icon);
+							if ( $h.find( '.' + ts.css.icon ).length ) {
+								icon = $h.find( '.' + ts.css.icon ).clone( true );
+								$h.find( '.tablesorter-header-inner' ).html( th[ j ] ).append( icon );
 								if ( hsh && $sh.length ) {
-									icon = $sh.eq(j).find('.' + ts.css.icon).clone(true);
-									$sh.eq(j).find('.tablesorter-header-inner').html( th[j] ).append(icon);
+									icon = $sh.eq( j ).find( '.' + ts.css.icon ).clone( true );
+									$sh.eq( j ).find( '.tablesorter-header-inner' ).html( th[ j ] ).append( icon );
 								}
 							} else {
-								$h.find('.tablesorter-header-inner').html( th[j] );
-								if (hsh && $sh.length) {
-									$sh.eq(j).find('.tablesorter-header-inner').html( th[j] );
+								$h.find( '.tablesorter-header-inner' ).html( th[ j ] );
+								if ( hsh && $sh.length ) {
+									$sh.eq( j ).find( '.tablesorter-header-inner' ).html( th[ j ] );
 								}
 							}
-							$f.eq(j).html( th[j] );
+							$f.eq( j ).html( th[ j ] );
 						}
 					}
 				}
-				if (c.showProcessing) {
-					ts.isProcessing(table); // remove loading icon
+				if ( c.showProcessing ) {
+					ts.isProcessing( table ); // remove loading icon
 				}
 				// make sure last pager settings are saved, prevents multiple server side calls with
 				// the same parameters
 				p.totalPages = Math.ceil( p.totalRows / tsp.parsePageSize( c, p.size, 'get' ) );
 				p.last.totalRows = p.totalRows;
 				p.last.currentFilters = p.currentFilters;
-				p.last.sortList = (c.sortList || []).join(',');
+				p.last.sortList = ( c.sortList || [] ).join( ',' );
 				p.initializing = false;
 				// update display without triggering pager complete... before updating cache
-				tsp.updatePageDisplay(table, c, false);
+				tsp.updatePageDisplay( c, false );
 				// tablesorter core updateCache (not pager)
-				ts.updateCache( c, function(){
-					if (p.initialized) {
+				ts.updateCache( c, function() {
+					if ( p.initialized ) {
 						// apply widgets after table has rendered & after a delay to prevent
 						// multiple applyWidget blocking code from blocking this trigger
-						setTimeout(function(){
-							if (c.debug) {
-								console.log('Pager: Triggering pagerChange');
+						setTimeout( function() {
+							if ( c.debug ) {
+								console.log( 'Pager: Triggering pagerChange' );
 							}
 							$table.trigger( 'pagerChange', p );
 							ts.applyWidget( table );
-							tsp.updatePageDisplay(table, c);
-						}, 0);
+							tsp.updatePageDisplay( c );
+						}, 0 );
 					}
 				});
 			}
-			if (!p.initialized) {
+			if ( !p.initialized ) {
 				ts.applyWidget( table );
 			}
 		},
 
-		getAjax: function(table, c){
+		getAjax: function( c ) {
 			var counter,
-				url = tsp.getAjaxUrl(table, c),
-				$doc = $(document),
+				url = tsp.getAjaxUrl( c ),
+				$doc = $( document ),
 				namespace = c.namespace + 'pager',
 				p = c.pager;
 			if ( url !== '' ) {
-				if (c.showProcessing) {
-					ts.isProcessing(table, true); // show loading icon
+				if ( c.showProcessing ) {
+					ts.isProcessing( c.table, true ); // show loading icon
 				}
-				$doc.on('ajaxError' + namespace, function(e, xhr, settings, exception) {
-					tsp.renderAjax(null, table, c, xhr, settings, exception);
-					$doc.off('ajaxError' + namespace);
+				$doc.on( 'ajaxError' + namespace, function( e, xhr, settings, exception ) {
+					tsp.renderAjax( null, c, xhr, settings, exception );
+					$doc.off( 'ajaxError' + namespace );
 				});
 				counter = ++p.ajaxCounter;
 				p.last.ajaxUrl = url; // remember processed url
 				p.ajaxObject.url = url; // from the ajaxUrl option and modified by customAjaxUrl
-				p.ajaxObject.success = function(data, status, jqxhr) {
+				p.ajaxObject.success = function( data, status, jqxhr ) {
 					// Refuse to process old ajax commands that were overwritten by new ones - see #443
-					if (counter < p.ajaxCounter){
+					if ( counter < p.ajaxCounter ) {
 						return;
 					}
-					tsp.renderAjax(data, table, c, jqxhr);
-					$doc.off('ajaxError' + namespace);
-					if (typeof p.oldAjaxSuccess === 'function') {
-						p.oldAjaxSuccess(data);
+					tsp.renderAjax( data, c, jqxhr );
+					$doc.off( 'ajaxError' + namespace );
+					if ( typeof p.oldAjaxSuccess === 'function' ) {
+						p.oldAjaxSuccess( data );
 					}
 				};
-				if (c.debug) {
-					console.log('Pager: Ajax initialized', p.ajaxObject);
+				if ( c.debug ) {
+					console.log( 'Pager: Ajax initialized', p.ajaxObject );
 				}
-				$.ajax(p.ajaxObject);
+				$.ajax( p.ajaxObject );
 			}
 		},
 
-		getAjaxUrl: function(table, c) {
+		getAjaxUrl: function( c ) {
 			var indx, len,
 				p = c.pager,
 				wo = c.widgetOptions,
-				url = (wo.pager_ajaxUrl) ? wo.pager_ajaxUrl
+				url = wo.pager_ajaxUrl ? wo.pager_ajaxUrl
 					// allow using '{page+1}' in the url string to switch to a non-zero based index
-					.replace(/\{page([\-+]\d+)?\}/, function(s, n){ return p.page + (n ? parseInt(n, 10) : 0); })
-					.replace(/\{size\}/g, p.size) : '',
+					.replace( /\{page([\-+]\d+)?\}/, function( s, n ) { return p.page + ( n ? parseInt( n, 10 ) : 0 ); })
+					.replace( /\{size\}/g, p.size ) : '',
 				sortList = c.sortList,
-				filterList = p.currentFilters || $(table).data('lastSearch') || [],
-				sortCol = url.match(/\{\s*sort(?:List)?\s*:\s*(\w*)\s*\}/),
-				filterCol = url.match(/\{\s*filter(?:List)?\s*:\s*(\w*)\s*\}/),
+				filterList = p.currentFilters || c.$table.data( 'lastSearch' ) || [],
+				sortCol = url.match( /\{\s*sort(?:List)?\s*:\s*(\w*)\s*\}/ ),
+				filterCol = url.match( /\{\s*filter(?:List)?\s*:\s*(\w*)\s*\}/ ),
 				arry = [];
-			if (sortCol) {
-				sortCol = sortCol[1];
+			if ( sortCol ) {
+				sortCol = sortCol[ 1 ];
 				len = sortList.length;
-				for (indx = 0; indx < len; indx++) {
-					arry.push(sortCol + '[' + sortList[indx][0] + ']=' + sortList[indx][1]);
+				for ( indx = 0; indx < len; indx++ ) {
+					arry.push( sortCol + '[' + sortList[ indx ][ 0 ] + ']=' + sortList[ indx ][ 1 ] );
 				}
 				// if the arry is empty, just add the col parameter... '&{sortList:col}' becomes '&col'
-				url = url.replace(/\{\s*sort(?:List)?\s*:\s*(\w*)\s*\}/g, arry.length ? arry.join('&') : sortCol );
+				url = url.replace( /\{\s*sort(?:List)?\s*:\s*(\w*)\s*\}/g, arry.length ? arry.join( '&' ) : sortCol );
 				arry = [];
 			}
-			if (filterCol) {
-				filterCol = filterCol[1];
+			if ( filterCol ) {
+				filterCol = filterCol[ 1 ];
 				len = filterList.length;
-				for (indx = 0; indx < len; indx++) {
-					if (filterList[indx]) {
-						arry.push(filterCol + '[' + indx + ']=' + encodeURIComponent(filterList[indx]));
+				for ( indx = 0; indx < len; indx++ ) {
+					if ( filterList[ indx ] ) {
+						arry.push( filterCol + '[' + indx + ']=' + encodeURIComponent( filterList[ indx ] ) );
 					}
 				}
 				// if the arry is empty, just add the fcol parameter... '&{filterList:fcol}' becomes '&fcol'
-				url = url.replace(/\{\s*filter(?:List)?\s*:\s*(\w*)\s*\}/g, arry.length ? arry.join('&') : filterCol );
+				url = url.replace( /\{\s*filter(?:List)?\s*:\s*(\w*)\s*\}/g, arry.length ? arry.join( '&' ) : filterCol );
 				p.currentFilters = filterList;
 			}
-			if ( $.isFunction(wo.pager_customAjaxUrl) ) {
-				url = wo.pager_customAjaxUrl(table, url);
+			if ( $.isFunction( wo.pager_customAjaxUrl ) ) {
+				url = wo.pager_customAjaxUrl( c.table, url );
 			}
-			if (c.debug) {
-				console.log('Pager: Ajax url = ' + url);
+			if ( c.debug ) {
+				console.log( 'Pager: Ajax url = ' + url );
 			}
 			return url;
 		},
 
-		renderTable: function(table, rows) {
+		renderTable: function( c, rows ) {
 			var $tb, index, count, added,
-				c = table.config,
+				table = c.table,
 				p = c.pager,
 				wo = c.widgetOptions,
 				f = c.$table.hasClass('hasFilters'),
@@ -870,81 +912,83 @@
 				s = ( p.page * p.size ),
 				e = p.size;
 			if ( l < 1 ) {
-				if (c.debug) {
-					console.warn('Pager: >> No rows for pager to render');
+				if ( c.debug ) {
+					console.warn( 'Pager: >> No rows for pager to render' );
 				}
 				// empty table, abort!
 				return;
 			}
 			if ( p.page >= p.totalPages ) {
 				// lets not render the table more than once
-				return tsp.moveToLastPage(table, p);
+				return tsp.moveToLastPage( c, p );
 			}
 			p.cacheIndex = [];
 			p.isDisabled = false; // needed because sorting will change the page and re-enable the pager
-			if (p.initialized) {
-				if (c.debug) {
-					console.log('Pager: Triggering pagerChange');
+			if ( p.initialized ) {
+				if ( c.debug ) {
+					console.log( 'Pager: Triggering pagerChange' );
 				}
 				c.$table.trigger( 'pagerChange', c );
 			}
 			if ( !wo.pager_removeRows ) {
-				tsp.hideRows(table, c);
+				tsp.hideRows( c );
 			} else {
-				ts.clearTableBody(table);
-				$tb = ts.processTbody(table, c.$tbodies.eq(0), true);
+				ts.clearTableBody( table );
+				$tb = ts.processTbody( table, c.$tbodies.eq(0), true );
 				// not filtered, start from the calculated starting point (s)
 				// if filtered, start from zero
 				index = f ? 0 : s;
 				count = f ? 0 : s;
 				added = 0;
-				while (added < e && index < rows.length) {
-					if (!f || !/filtered/.test(rows[index][0].className)){
+				while ( added < e && index < rows.length ) {
+					if ( !f || !/filtered/.test( rows[ index ][ 0 ].className ) ) {
 						count++;
-						if (count > s && added <= e) {
+						if ( count > s && added <= e ) {
 							added++;
-							p.cacheIndex.push(index);
-							$tb.append(rows[index]);
+							p.cacheIndex.push( index );
+							$tb.append( rows[ index ] );
 						}
 					}
 					index++;
 				}
-				ts.processTbody(table, $tb, false);
+				ts.processTbody( table, $tb, false );
 			}
-			tsp.updatePageDisplay(table, c);
+			tsp.updatePageDisplay( c );
 
 			wo.pager_startPage = p.page;
 			wo.pager_size = p.size;
-			if (table.isUpdating) {
-				if (c.debug) {
-					console.log('Pager: Triggering updateComplete');
+			if ( table.isUpdating ) {
+				if ( c.debug ) {
+					console.log( 'Pager: Triggering updateComplete' );
 				}
-				c.$table.trigger('updateComplete', [ table, true ]);
+				c.$table.trigger( 'updateComplete', [ table, true ] );
 			}
 
 		},
 
-		showAllRows: function(table, c){
+		showAllRows: function( c ) {
 			var index, $controls, len,
+				table = c.table,
 				p = c.pager,
 				wo = c.widgetOptions;
 			if ( p.ajax ) {
-				tsp.pagerArrows(c, true);
+				tsp.pagerArrows( c, true );
 			} else {
-				$.data(table, 'pagerLastPage', p.page);
-				$.data(table, 'pagerLastSize', p.size);
+				$.data( table, 'pagerLastPage', p.page );
+				$.data( table, 'pagerLastSize', p.size );
 				p.page = 0;
 				p.size = p.totalRows;
 				p.totalPages = 1;
 				c.$table
-					.addClass('pagerDisabled')
-					.removeAttr('aria-describedby')
-					.find('tr.pagerSavedHeightSpacer').remove();
-				tsp.renderTable(table, c.rowsCopy);
+					.addClass( 'pagerDisabled' )
+					.removeAttr( 'aria-describedby' )
+					.find( 'tr.pagerSavedHeightSpacer' )
+					.remove();
+				tsp.renderTable( c, c.rowsCopy );
 				p.isDisabled = true;
 				ts.applyWidget( table );
-				if (c.debug) {
-					console.log('Pager: Disabled');
+				if ( c.debug ) {
+					console.log( 'Pager: Disabled' );
 				}
 			}
 			// disable size selector
@@ -955,96 +999,99 @@
 			for ( index = 0; index < len; index++ ) {
 				$controls.eq( index )
 					.attr( 'aria-disabled', 'true' )
-					.addClass( wo.pager_css.disabled )[0].disabled = true;
+					.addClass( wo.pager_css.disabled )[ 0 ].disabled = true;
 			}
 		},
 
 		// updateCache if delayInit: true
 		// this is normally done by 'appendToTable' function in the tablesorter core AFTER a sort
-		updateCache: function(table) {
-			var c = table.config,
-				p = c.pager;
+		updateCache: function( c ) {
+			var p = c.pager;
 			// tablesorter core updateCache (not pager)
-			ts.updateCache( c, function(){
-				if ( !$.isEmptyObject(table.config.cache) ) {
-					var i,
+			ts.updateCache( c, function() {
+				if ( !$.isEmptyObject( c.cache ) ) {
+					var index,
 						rows = [],
-						n = table.config.cache[0].normalized;
-					p.totalRows = n.length;
-					for (i = 0; i < p.totalRows; i++) {
-						rows.push(n[i][c.columns].$row);
+						normalized = c.cache[ 0 ].normalized;
+					p.totalRows = normalized.length;
+					for ( index = 0; index < p.totalRows; index++ ) {
+						rows.push( normalized[ index ][ c.columns ].$row );
 					}
 					c.rowsCopy = rows;
-					tsp.moveToPage(table, p, true);
+					tsp.moveToPage( c, p, true );
 					// clear out last search to force an update
 					p.last.currentFilters = [ ' ' ];
 				}
 			});
 		},
 
-		moveToPage: function(table, p, pageMoved) {
+		moveToPage: function( c, p, pageMoved ) {
 			if ( p.isDisabled ) { return; }
-			if ( pageMoved !== false && p.initialized && $.isEmptyObject(table.config.cache)) {
-				return tsp.updateCache(table);
+			if ( pageMoved !== false && p.initialized && $.isEmptyObject( c.cache ) ) {
+				return tsp.updateCache( c );
 			}
-			var c = table.config,
+			var table = c.table,
 				wo = c.widgetOptions,
 				l = p.last;
 
 			// abort page move if the table has filters and has not been initialized
-			if (p.ajax && !wo.filter_initialized && ts.hasWidget(table, 'filter')) { return; }
+			if ( p.ajax && !wo.filter_initialized && ts.hasWidget( table, 'filter' ) ) { return; }
 
-			tsp.parsePageNumber( p );
-			tsp.calcFilters(table, c);
+			tsp.parsePageNumber( c, p );
+			tsp.calcFilters( c );
 
 			// fixes issue where one current filter is [] and the other is [ '', '', '' ],
 			// making the next if comparison think the filters as different. Fixes #202.
-			l.currentFilters = (l.currentFilters || []).join('') === '' ? [] : l.currentFilters;
-			p.currentFilters = (p.currentFilters || []).join('') === '' ? [] : p.currentFilters;
+			l.currentFilters = ( l.currentFilters || [] ).join( '' ) === '' ? [] : l.currentFilters;
+			p.currentFilters = ( p.currentFilters || [] ).join( '' ) === '' ? [] : p.currentFilters;
 			// 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.currentFilters || [] ).join( ',' ) === ( p.currentFilters || [] ).join( ',' ) &&
 				// check for ajax url changes see #730
-				(l.ajaxUrl || '') === (p.ajaxObject.url || '') &&
+				( l.ajaxUrl || '' ) === ( p.ajaxObject.url || '' ) &&
 				// & ajax url option changes (dynamically add/remove/rename sort & filter parameters)
-				(l.optAjaxUrl || '') === (wo.pager_ajaxUrl || '') &&
-				l.sortList === (c.sortList || []).join(',') ) {
+				( l.optAjaxUrl || '' ) === ( wo.pager_ajaxUrl || '' ) &&
+				l.sortList === ( c.sortList || [] ).join( ',' ) ) {
 				return;
 			}
-			if (c.debug) {
-				console.log('Pager: Changing to page ' + p.page);
+			if ( c.debug ) {
+				console.log( 'Pager: Changing to page ' + p.page );
 			}
 			p.last = {
-				page : p.page,
-				size : p.size,
+				page: p.page,
+				size: p.size,
 				// fixes #408; modify sortList otherwise it auto-updates
-				sortList : (c.sortList || []).join(','),
-				totalRows : p.totalRows,
-				currentFilters : p.currentFilters || [],
-				ajaxUrl : p.ajaxObject.url || '',
-				optAjaxUrl : wo.pager_ajaxUrl
+				sortList: ( c.sortList || [] ).join( ',' ),
+				totalRows: p.totalRows,
+				currentFilters: p.currentFilters || [],
+				ajaxUrl: p.ajaxObject.url || '',
+				optAjaxUrl: wo.pager_ajaxUrl
 			};
-			if (p.ajax) {
-				tsp.getAjax(table, c);
-			} else if (!p.ajax) {
-				tsp.renderTable(table, c.rowsCopy);
+			if ( p.ajax ) {
+				tsp.getAjax( c );
+			} else if ( !p.ajax ) {
+				tsp.renderTable( c, c.rowsCopy );
 			}
-			$.data(table, 'pagerLastPage', p.page);
-			if (p.initialized && pageMoved !== false) {
-				if (c.debug) {
-					console.log('Pager: Triggering pageMoved');
+			$.data( table, 'pagerLastPage', p.page );
+			if ( p.initialized && pageMoved !== false ) {
+				if ( c.debug ) {
+					console.log( 'Pager: Triggering pageMoved' );
 				}
-				c.$table.trigger('pageMoved', c);
+				c.$table.trigger( 'pageMoved', c );
 				ts.applyWidget( table );
-				if (!p.ajax && table.isUpdating) {
-					if (c.debug) {
-						console.log('Pager: Triggering updateComplete');
+				if ( !p.ajax && table.isUpdating ) {
+					if ( c.debug ) {
+						console.log( 'Pager: Triggering updateComplete' );
 					}
-					c.$table.trigger('updateComplete', [ table, true ]);
+					c.$table.trigger( 'updateComplete', [ table, true ] );
 				}
 			}
 		},
 
+		getTotalPages: function( c, p ) {
+			return ts.hasWidget( c.table, 'filter' ) ? Math.min( p.totalPages, p.filteredPages ) : p.totalPages;
+		},
+
 		// set to either set or get value
 		parsePageSize: function( c, size, mode ) {
 			var p = c.pager,
@@ -1057,54 +1104,56 @@
 				( mode === 'get' ? s : p.size );
 		},
 
-		parsePageNumber: function( p ) {
-			var min = Math.min( p.totalPages, p.filteredPages ) - 1;
+		parsePageNumber: function( c, p ) {
+			var min = tsp.getTotalPages( c, p ) - 1;
 			p.page = parseInt( p.page, 10 );
 			if ( p.page < 0 || isNaN( p.page ) ) { p.page = 0; }
-			if ( p.page > min && p.page !== 0 ) { p.page = min; }
+			if ( p.page > min && min >= 0 ) { p.page = min; }
 			return p.page;
 		},
 
-		setPageSize: function(c, size) {
+		setPageSize: function( c, size ) {
 			var p = c.pager,
 				table = c.table;
 			p.size = tsp.parsePageSize( c, size, 'get' );
 			p.$size.val( tsp.parsePageSize( c, p.size, 'set' ) );
-			$.data(table, 'pagerLastPage', tsp.parsePageNumber( p ) );
-			$.data(table, 'pagerLastSize', p.size);
+			$.data( table, 'pagerLastPage', tsp.parsePageNumber( c, p ) );
+			$.data( table, 'pagerLastSize', p.size );
 			p.totalPages = Math.ceil( p.totalRows / p.size );
 			p.filteredPages = Math.ceil( p.filteredRows / p.size );
-			tsp.moveToPage(table, p, true);
+			tsp.moveToPage( c, p, true );
 		},
 
-		moveToFirstPage: function(table, p) {
+		moveToFirstPage: function( c, p ) {
 			p.page = 0;
-			tsp.moveToPage(table, p, true);
+			tsp.moveToPage( c, p, true );
 		},
 
-		moveToLastPage: function(table, p) {
-			p.page = ( Math.min( p.totalPages, p.filteredPages ) - 1 );
-			tsp.moveToPage(table, p, true);
+		moveToLastPage: function( c, p ) {
+			p.page = tsp.getTotalPages( c, p ) - 1;
+			tsp.moveToPage( c, p, true );
 		},
 
-		moveToNextPage: function(table, p) {
+		moveToNextPage: function( c, p ) {
 			p.page++;
-			if ( p.page >= ( Math.min( p.totalPages, p.filteredPages ) - 1 ) ) {
-				p.page = ( Math.min( p.totalPages, p.filteredPages ) - 1 );
+			var last = tsp.getTotalPages( c, p ) - 1;
+			if ( p.page >= last ) {
+				p.page = last;
 			}
-			tsp.moveToPage(table, p, true);
+			tsp.moveToPage( c, p, true );
 		},
 
-		moveToPrevPage: function(table, p) {
+		moveToPrevPage: function( c, p ) {
 			p.page--;
 			if ( p.page <= 0 ) {
 				p.page = 0;
 			}
-			tsp.moveToPage(table, p, true);
+			tsp.moveToPage( c, p, true );
 		},
 
-		destroyPager: function(table, c, refreshing){
-			var p = c.pager,
+		destroyPager: function( c, refreshing ) {
+			var table = c.table,
+				p = c.pager,
 				s = c.widgetOptions.pager_selectors,
 				ctrls = [ s.first, s.prev, s.next, s.last, s.gotoPage, s.pageSize ].join( ',' ),
 				namespace = c.namespace + 'pager';
@@ -1117,57 +1166,58 @@
 				.find( ctrls )
 				.off( namespace );
 			if ( refreshing ) { return; }
-			tsp.showAllRows(table, c);
+			tsp.showAllRows( c );
 			c.appender = null; // remove pager appender function
-			if (ts.storage) {
-				ts.storage(table, c.widgetOptions.pager_storageKey, '');
+			if ( ts.storage ) {
+				ts.storage( table, c.widgetOptions.pager_storageKey, '' );
 			}
 			delete table.config.pager;
 			delete table.config.rowsCopy;
 		},
 
-		enablePager: function(table, c, triggered){
+		enablePager: function( c, triggered ) {
 			var info, size,
+				table = c.table,
 				p = c.pager;
 			p.isDisabled = false;
-			p.page = $.data(table, 'pagerLastPage') || p.page || 0;
-			size = p.$size.find('option[selected]').val();
-			p.size = $.data(table, 'pagerLastSize') || tsp.parsePageSize( c, size, 'get' );
+			p.page = $.data( table, 'pagerLastPage' ) || p.page || 0;
+			size = p.$size.find( 'option[selected]' ).val();
+			p.size = $.data( table, 'pagerLastSize' ) || tsp.parsePageSize( c, size, 'get' );
 			p.$size.val( tsp.parsePageSize( c, p.size, 'set' ) ); // set page size
-			p.totalPages = Math.ceil( Math.min( p.totalRows, p.filteredRows ) / p.size );
-			c.$table.removeClass('pagerDisabled');
+			p.totalPages = Math.ceil( tsp.getTotalPages( c, p ) / p.size );
+			c.$table.removeClass( 'pagerDisabled' );
 			// if table id exists, include page display with aria info
 			if ( table.id ) {
 				info = table.id + '_pager_info';
-				p.$container.find(c.widgetOptions.pager_selectors.pageDisplay).attr('id', info);
-				c.$table.attr('aria-describedby', info);
+				p.$container.find( c.widgetOptions.pager_selectors.pageDisplay ).attr( 'id', info );
+				c.$table.attr( 'aria-describedby', info );
 			}
-			tsp.changeHeight(table, c);
+			tsp.changeHeight( c );
 			if ( triggered ) {
 				// tablesorter core update table
 				ts.update( c );
-				tsp.setPageSize(c, p.size);
-				tsp.hideRowsSetup(table, c);
-				if (c.debug) {
-					console.log('Pager: Enabled');
+				tsp.setPageSize( c, p.size );
+				tsp.hideRowsSetup( c );
+				if ( c.debug ) {
+					console.log( 'Pager: Enabled' );
 				}
 			}
 		},
 
-		appender: function(table, rows) {
+		appender: function( table, rows ) {
 			var c = table.config,
 				wo = c.widgetOptions,
 				p = c.pager;
 			if ( !p.ajax ) {
 				c.rowsCopy = rows;
-				p.totalRows = wo.pager_countChildRows ? c.$tbodies.eq(0).children('tr').length : rows.length;
-				p.size = $.data(table, 'pagerLastSize') || p.size || wo.pager_size || p.setSize || 10;
+				p.totalRows = wo.pager_countChildRows ? c.$tbodies.eq( 0 ).children( 'tr' ).length : rows.length;
+				p.size = $.data( table, 'pagerLastSize' ) || p.size || wo.pager_size || p.setSize || 10;
 				p.totalPages = Math.ceil( p.totalRows / p.size );
-				tsp.moveToPage(table, p);
+				tsp.moveToPage( c, p );
 				// update display here in case all rows are removed
-				tsp.updatePageDisplay(table, c, false);
+				tsp.updatePageDisplay( c, false );
 			} else {
-				tsp.moveToPage(table, p, true);
+				tsp.moveToPage( c, p, true );
 			}
 		}
 
@@ -1177,7 +1227,7 @@
 	ts.showError = function( table, xhr, settings, exception ) {
 		var $row,
 			$table = $( table ),
-			c = $table[0].config,
+			c = $table[ 0 ].config,
 			wo = c && c.widgetOptions,
 			errorRow = c.pager && c.pager.cssErrorRow ||
 				wo && wo.pager_css && wo.pager_css.errorRow ||
@@ -1185,12 +1235,12 @@
 			typ = typeof xhr,
 			valid = true,
 			message = '',
-			removeRow = function(){
+			removeRow = function() {
 				c.$table.find( 'thead' ).find( '.' + errorRow ).remove();
 			};
 
 		if ( !$table.length ) {
-			console.error('tablesorter showError: no table parameter passed');
+			console.error( 'tablesorter showError: no table parameter passed' );
 			return;
 		}
 
@@ -1231,16 +1281,18 @@
 		}
 
 		// allow message to include entire row HTML!
-		$row = ( /tr\>/.test(message) ? $(message) : $('<tr><td colspan="' + c.columns + '">' + message + '</td></tr>') )
+		$row = ( /tr\>/.test( message ) ?
+			$( message ) :
+			$( '<tr><td colspan="' + c.columns + '">' + message + '</td></tr>' ) )
 			.click( function() {
 				$( this ).remove();
 			})
 			// add error row to thead instead of tbody, or clicking on the header will result in a parser error
 			.appendTo( c.$table.find( 'thead:first' ) )
-			.addClass( errorRow + ' ' + c.selectorRemove.slice(1) )
+			.addClass( errorRow + ' ' + c.selectorRemove.slice( 1 ) )
 			.attr({
-				role : 'alert',
-				'aria-live' : 'assertive'
+				role: 'alert',
+				'aria-live': 'assertive'
 			});
 
 	};