Update tablesorter to latest version (2.30.4)

Author: themilkman

CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 ===
 
+#### v1.25.2 (2018-05-21)
+
+* Upgrade tablesorter to v2.30.4
+
 #### v1.25.1 (2018-04-01)
 
 * Upgrade tablesorter to v2.30.3

README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jQuery tablesorter ([Mottie's fork]) into the asset pipeline.
 
-Current tablesorter version: 2.30.3 (2018-03-30) [documentation]
+Current tablesorter version: 2.30.4 (2018-05-16) [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 = 25
-  TINY  = 1
+  TINY  = 2
 
   VERSION = [MAJOR, MINOR, TINY].compact.join('.')
 end

tablesorter

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀    ▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 2018-04-30 (v2.30.3)*/
+/*! tablesorter (FORK) - updated 2018-05-16 (v2.30.4)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -16,7 +16,7 @@
 	}
 }(function(jQuery) {
 
-/*! TableSorter (FORK) v2.30.3 *//*
+/*! TableSorter (FORK) v2.30.4 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -40,7 +40,7 @@
 	'use strict';
 	var ts = $.tablesorter = {
 
-		version : '2.30.3',
+		version : '2.30.4',
 
 		parsers : [],
 		widgets : [],
@@ -538,7 +538,7 @@
 				$cell = ts.getClosest( $( this ), '.' + ts.css.header );
 				// use column index from data-attribute or index of current row; fixes #1116
 				c.last.clickedIndex = $cell.attr( 'data-column' ) || $cell.index();
-				cell = c.$headerIndexed[ c.last.clickedIndex ];
+				cell = c.$headerIndexed[ c.last.clickedIndex ][0];
 				if ( cell && !cell.sortDisabled ) {
 					ts.initSort( c, cell, e );
 				}

vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.combined.js

@@ -1,4 +1,4 @@
-/*! TableSorter (FORK) v2.30.3 *//*
+/*! TableSorter (FORK) v2.30.4 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -22,7 +22,7 @@
 	'use strict';
 	var ts = $.tablesorter = {
 
-		version : '2.30.3',
+		version : '2.30.4',
 
 		parsers : [],
 		widgets : [],
@@ -520,7 +520,7 @@
 				$cell = ts.getClosest( $( this ), '.' + ts.css.header );
 				// use column index from data-attribute or index of current row; fixes #1116
 				c.last.clickedIndex = $cell.attr( 'data-column' ) || $cell.index();
-				cell = c.$headerIndexed[ c.last.clickedIndex ];
+				cell = c.$headerIndexed[ c.last.clickedIndex ][0];
 				if ( cell && !cell.sortDisabled ) {
 					ts.initSort( c, cell, e );
 				}

vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.js

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀    ▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 2018-04-30 (v2.30.3)*/
+/*! tablesorter (FORK) - updated 2018-05-16 (v2.30.4)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {

vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.widgets.js

@@ -1,4 +1,4 @@
-/*! Widget: scroller - updated 2018-02-25 (v2.29.6) *//*
+/*! Widget: scroller - updated 2018-05-07 (v2.30.4) *//*
 	Copyright (C) 2011 T. Connell & Associates, Inc.
 
 	Dual-licensed under the MIT and GPL licenses
@@ -203,6 +203,7 @@
 			wo.scroller_calcWidths = [];
 			wo.scroller_saved = [ 0, 0 ];
 			wo.scroller_isBusy = true;
+			wo.scroller_scrollTimer = null;
 
 			// set scrollbar width to one of the following (1) explicitly set scroller_barWidth option,
 			// (2) detected scrollbar width or (3) fallback of 15px
@@ -273,8 +274,11 @@
 				.off( 'scroll' + namespace )
 				.on( 'scroll' + namespace, function() {
 					// Save position
-					wo.scroller_saved[0] = $tableWrap.scrollLeft();
-					wo.scroller_saved[1] = $tableWrap.scrollTop();
+					clearTimeout(wo.scroller_scrollTimer);
+					wo.scroller_scrollTimer = setTimeout(function() {
+						wo.scroller_saved[0] = $tableWrap.scrollLeft();
+						wo.scroller_saved[1] = $tableWrap.scrollTop();
+					}, 300);
 					if ( wo.scroller_jumpToHeader ) {
 						var pos = $win.scrollTop() - $hdr.offset().top;
 						if ( $( this ).scrollTop() !== 0 && pos < tbHt && pos > 0 ) {
@@ -295,12 +299,18 @@
 
 			$table
 				.off( namespace )
+				.on( 'sortStart' + namespace, function() {
+					clearTimeout(wo.scroller_scrollTimer);
+					wo.scroller_isBusy = true;
+				})
 				.on( 'sortEnd filterEnd'.split( ' ' ).join( namespace + ' ' ), function( event ) {
 					// Sorting, so scroll to top
 					if ( event.type === 'sortEnd' && wo.scroller_upAfterSort ) {
-						$tableWrap.animate({
-							scrollTop : 0
-						}, 'fast' );
+						$tableWrap
+							.scrollLeft( wo.scroller_saved[0] )
+							.animate({ scrollTop : 0 }, 'fast', function() {
+								wo.scroller_isBusy = false;
+							});
 					} else if ( wo.scroller_fixedColumns ) {
 						setTimeout( function() {
 							// restore previous scroll position
@@ -859,7 +869,9 @@
 			$fixedColumn.find('caption').height( wo.scroller_$header.find( 'caption' ).height() );
 
 			$tableWrap.scroll();
-			wo.scroller_isBusy = false;
+			setTimeout(function() {
+				wo.scroller_isBusy = false;
+			}, 0)
 
 		},