Update tablesorter to latest version (2.28.6)

Author: themilkman

CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 ===
 
+#### v1.23.6 (2017-04-02)
+
+* Upgrade tablesorter to v2.28.6
+
 #### v1.23.5 (2017-01-10)
 
 * Upgrade tablesorter to v2.28.5

README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jQuery tablesorter ([Mottie's fork]) into the asset pipeline.
 
-Current tablesorter version: 2.28.5 (1/28/2017), [documentation]
+Current tablesorter version: 2.28.6 (4/2/2017), [documentation]
 
 Any issue associated with the js/css files, please report to [Mottie's fork].
 

lib/jquery-tablesorter/version.rb

@@ -1,7 +1,7 @@
 module JqueryTablesorter
   MAJOR = 1
   MINOR = 23
-  TINY  = 5
+  TINY  = 6
 
   VERSION = [MAJOR, MINOR, TINY].compact.join('.')
 end

tablesorter

@@ -1,6 +1,6 @@
 /*!
 * tablesorter (FORK) pager plugin
-* updated 1/6/2017 (v2.28.4)
+* updated 4/2/2017 (v2.28.6)
 */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($) {
@@ -393,10 +393,8 @@
 			},
 
 			hideRowsSetup = function(table, p){
-				var $el = p.$container.find(p.cssPageSize);
-				p.size = parsePageSize( p, $el.val(), 'get' );
-				$el.val( p.size );
-				$.data(table, 'pagerLastSize', p.size);
+				p.size = parsePageSize( p, p.$container.find(p.cssPageSize).val(), 'get' );
+				setPageSize( table, p.size, p );
 				pagerArrows( table, p );
 				if ( !p.removeRows ) {
 					hideRows(table, p);
@@ -689,7 +687,7 @@
 					$.data(table, 'pagerLastPage', p.page);
 					$.data(table, 'pagerLastSize', p.size);
 					p.page = 0;
-					p.size = 'all';
+					p.size = p.totalPages;
 					p.totalPages = 1;
 					$(table)
 					.addClass('pagerDisabled')
@@ -799,15 +797,9 @@
 			},
 
 			getTotalPages = function( table, p ) {
-				return ts.hasWidget( table, 'filter' ) ? Math.min( p.totalPages, p.filteredPages ) : p.totalPages;
-			},
-
-			// set to either set or get value
-			parsePageSize = function( p, size, mode ) {
-				var s = parseInt( size, 10 ) || p.size || p.settings.size || 10;
-				return p.initialized && (/all/i.test( size ) || s === p.totalRows) ?
-				// "get" to get `p.size` or "set" to set `pageSize.val()`
-				'all' : ( mode === 'get' ? s : p.size );
+				return ts.hasWidget( table, 'filter' ) ?
+					Math.min( p.totalPages, p.filteredPages ) :
+					p.totalPages;
 			},
 
 			parsePageNumber = function( table, p ) {
@@ -818,14 +810,26 @@
 				return p.page;
 			},
 
+			// set to either set or get value
+			parsePageSize = function( p, size, mode ) {
+				var s = parseInt( size, 10 ) || p.size || p.settings.size || 10;
+				if (p.initialized && (/all/i.test( s + ' ' + size ) || s === p.totalRows)) {
+					// Fixing #1364 & #1366
+					return p.$container.find(p.cssPageSize + ' option[value="all"]').length ?
+						'all' : p.totalRows;
+				}
+				// "get" to get `p.size` or "set" to set `pageSize.val()`
+				return mode === 'get' ? s : p.size;
+			},
+
 			setPageSize = function(table, size, p) {
+				// "all" size is only returned if an "all" option exists - fixes #1366
 				p.size = parsePageSize( p, size, 'get' );
-				p.$container.find(p.cssPageSize).val( parsePageSize( p, p.size, 'set' ) );
+				p.$container.find( p.cssPageSize ).val( p.size );
 				$.data(table, 'pagerLastPage', parsePageNumber( table, p ) );
 				$.data(table, 'pagerLastSize', p.size);
 				p.totalPages = p.size === 'all' ? 1 : Math.ceil( p.totalRows / p.size );
 				p.filteredPages = p.size === 'all' ? 1 : Math.ceil( p.filteredRows / p.size );
-				moveToPage(table, p);
 			},
 
 			moveToFirstPage = function(table, p) {
@@ -906,8 +910,8 @@
 				$el = p.$container.find(p.cssPageSize);
 				size = $el.find('option[selected]').val();
 				p.size = $.data(table, 'pagerLastSize') || parsePageSize( p, size, 'get' );
-				$el.val( p.size ); // set page size
 				p.totalPages = p.size === 'all' ? 1 : Math.ceil( getTotalPages( table, p ) / p.size );
+				setPageSize(table, p.size, p); // set page size
 				// if table id exists, include page display with aria info
 				if ( table.id && !c.$table.attr( 'aria-describedby' ) ) {
 					$el = p.$container.find( p.cssPageDisplay );
@@ -924,6 +928,7 @@
 					// tablesorter core update table
 					ts.update( c );
 					setPageSize(table, p.size, p);
+					moveToPage(table, p);
 					hideRowsSetup(table, p);
 					if (c.debug) {
 						console.log('Pager: Enabled');
@@ -952,8 +957,7 @@
 					t = ts.storage(table, p.storageKey) || {}; // fixes #387
 					p.page = isNaN(t.page) ? p.page : t.page;
 					p.size = t.size === 'all' ? t.size : ( isNaN( t.size ) ? p.size : t.size ) || p.setSize || 10;
-					$.data(table, 'pagerLastSize', p.size);
-					pager.find(p.cssPageSize).val(p.size);
+					setPageSize(table, p.size, p);
 				}
 				// skipped rows
 				p.regexRows = new RegExp('(' + (wo.filter_filteredRow || 'filtered') + '|' + c.selectorRemove.slice(1) + '|' + c.cssChildRow + ')');
@@ -965,7 +969,10 @@
 				.bind('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' && p.pageReset !== false && (c.lastCombinedFilter || '') !== (p.currentFilters || []).join('')) {
+					if (
+						e.type === 'filterStart' &&
+						p.pageReset !== false &&
+						(c.lastSearch || []).join(',') !== (p.currentFilters || []).join(',')) {
 						p.page = p.pageReset; // fixes #456 & #565
 					}
 				})
@@ -1020,6 +1027,7 @@
 				.bind('pageSize refreshComplete '.split(' ').join(namespace + ' '), function(e, size){
 					e.stopPropagation();
 					setPageSize(table, parsePageSize( p, size, 'get' ), p);
+					moveToPage(table, p);
 					hideRows(table, p);
 					updatePageDisplay(table, p, false);
 				})
@@ -1087,8 +1095,8 @@
 						if ( !$(this).hasClass(p.cssDisabled) ) {
 							var size = $(this).val();
 							// in case there are more than one pager
-							p.$container.find(p.cssGoto).val( size );
 							setPageSize(table, size, p);
+							moveToPage(table, p);
 							changeHeight(table, p);
 						}
 						return false;
@@ -1122,6 +1130,8 @@
 				if (!p.ajax && !p.initialized) {
 					p.initializing = false;
 					p.initialized = true;
+					// update page size on init
+					setPageSize(table, p.size, p);
 					moveToPage(table, p);
 					if (c.debug) {
 						console.log('Pager: Triggering pagerInitialized');