2.30.2

.gitignore

@@ -162,5 +162,10 @@ pip-log.txt
 #Mr Developer
 .mr.developer.cfg
 
+
+# lockfiles
+package-lock.json
+yarn.lock
+
 # Mac crap
 .DS_Store

README.md

@@ -104,6 +104,28 @@ If you would like to contribute, please...
 
 View the [complete change log here](https://github.com/Mottie/tablesorter/wiki/Changes).
 
+#### <a name="v2.30.2">Version 2.30.2</a> (2018-03-26)
+
+* Core:
+  * Allow passing headers from multiple rows. See [issue #1116](https://github.com/Mottie/tablesorter/issues/1116).
+  * Use local `$` inside of IIFE. Fixes [issue #1542](https://github.com/Mottie/tablesorter/issues/1542).
+* Build:
+  * Use local `$` inside of IIFE. Fixes [issue #1542](https://github.com/Mottie/tablesorter/issues/1542).
+* Pager:
+  * Use local `$` inside of IIFE. Fixes [issue #1542](https://github.com/Mottie/tablesorter/issues/1542).
+* Resizable:
+  * Adjust handle position for jQuery v3.3.0+. Fixes [issue #1544](https://github.com/Mottie/tablesorter/issues/1544).
+* Vertical Group:
+  * Fix border css for last row.
+* Parser:
+  * Input-select: Fix TypeError `hasSticky` is undefined. See [issue #1534](https://github.com/Mottie/tablesorter/issues/1534) & [PR #1535](https://github.com/Mottie/tablesorter/pull/1535); thanks [@adamz01h](https://github.com/adamz01h).
+* Docs
+  * Improve load time.
+  * Update incorrect default. See [issue #1510](https://github.com/Mottie/tablesorter/issues/1510).
+  * Replace whitespace with symbols.
+* Meta:
+  * Update dependencies.
+
 #### <a name="v2.30.1">Version 2.30.1</a> (2018-03-19)
 
 * Core:
@@ -129,29 +151,3 @@ View the [complete change log here](https://github.com/Mottie/tablesorter/wiki/C
   * Update Bootstrap v4.0.0.
   * Adjust (accordion) link position.
   * Fix scroller fixed column border alignment.
-
-#### <a name="v2.29.6">Version 2.29.6</a> (2018-02-25)
-
-* Docs:
-  * Fix theme selector.
-  * `pager.page` is zero-based. See [issue #1516](https://github.com/Mottie/tablesorter/issues/1516).
-* Resizable:
-  * Don't save 'auto' table width. Closes [issue #1514](https://github.com/Mottie/tablesorter/issues/1514).
-* Scroller:
-  * Adjust spacing for jQuery UI themes. See [issue #1506](https://github.com/Mottie/tablesorter/issues/1506).
-* StickyHeaders:
-  * Allow nested tables in sticky header. See [Stack Overflow](https://stackoverflow.com/q/48793036/145346).
-  * Include nested tables inside a scrolling element. Fixes [issue #1512](https://github.com/Mottie/tablesorter/issues/1512).
-
-#### <a name="v2.29.5">Version 2.29.5</a> (2018-01-30)
-
-* Docs:
-  * Update jQuery to v3.3.1.
-  * Add jQuery UI theme selector to scroller demo. See [issue #1506](https://github.com/Mottie/tablesorter/issues/1506).
-  * Minor fixes to links.
-* Filter:
-  * Clean up language settings & allow empty strings. See [issue #1505](https://github.com/Mottie/tablesorter/issues/1505).
-  * Fix linting issue.
-  * Fix version numbering.
-* Parser:
-  * Add radio parser. See [issue #1502](https://github.com/Mottie/tablesorter/issues/1502).

addons/pager/jquery.tablesorter.pager.js

@@ -1,6 +1,6 @@
 /*!
 * tablesorter (FORK) pager plugin
-* updated 2018-03-19 (v2.30.1)
+* updated 2018-03-26 (v2.30.2)
 */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($) {

dist/js/jquery.tablesorter.combined.js

@@ -1,4 +1,4 @@
-/*! tablesorter (FORK) - updated 2018-03-19 (v2.30.1)*/
+/*! tablesorter (FORK) - updated 2018-04-26 (v2.30.2)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -10,7 +10,7 @@
 	}
 }(function(jQuery) {
 
-/*! TableSorter (FORK) v2.30.1 *//*
+/*! TableSorter (FORK) v2.30.2 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -34,7 +34,7 @@
 	'use strict';
 	var ts = $.tablesorter = {
 
-		version : '2.30.1',
+		version : '2.30.2',
 
 		parsers : [],
 		widgets : [],
@@ -530,11 +530,8 @@
 					ts.buildCache( c );
 				}
 				$cell = ts.getClosest( $( this ), '.' + ts.css.header );
-				// reference original table headers and find the same cell
-				// don't use $headers or IE8 throws an error - see #987
-				temp = $headers.index( $cell );
-				c.last.clickedIndex = ( temp < 0 ) ? $cell.attr( 'data-column' ) : temp;
-				// use column index if $headers is undefined
+				// use column index from data-attribute or index of current row; fixes #1116
+				c.last.clickedIndex = $cell.attr( 'data-column' ) || $cell.index();
 				cell = c.$headers[ c.last.clickedIndex ];
 				if ( cell && !cell.sortDisabled ) {
 					ts.initSort( c, cell, e );
@@ -1412,7 +1409,7 @@
 			} else if (
 				!$row ||
 				// row is a jQuery object?
-				!( $row instanceof jQuery ) ||
+				!( $row instanceof $ ) ||
 				// row contained in the table?
 				( ts.getClosest( $row, 'table' )[ 0 ] !== c.table )
 			) {
@@ -5576,7 +5573,7 @@
 
 })(jQuery, window);
 
-/*! Widget: resizable - updated 2018-02-14 (v2.29.6) */
+/*! Widget: resizable - updated 2018-03-26 (v2.30.2) */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function ($, window) {
 	'use strict';
@@ -5746,7 +5743,8 @@
 				tableHeight -= c.$table.children('tfoot').height();
 			}
 			// subtract out table left position from resizable handles. Fixes #864
-			startPosition = c.$table.position().left;
+			// jQuery v3.3.0+ appears to include the start position with the $header.position().left; see #1544
+			startPosition = parseFloat($.fn.jquery) >= 3.3 ? 0 : c.$table.position().left;
 			$handles.each( function() {
 				var $this = $(this),
 					column = parseInt( $this.attr( 'data-column' ), 10 ),

dist/js/jquery.tablesorter.js

@@ -8,7 +8,7 @@
 	}
 }(function(jQuery) {
 
-/*! TableSorter (FORK) v2.30.1 *//*
+/*! TableSorter (FORK) v2.30.2 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -32,7 +32,7 @@
 	'use strict';
 	var ts = $.tablesorter = {
 
-		version : '2.30.1',
+		version : '2.30.2',
 
 		parsers : [],
 		widgets : [],
@@ -528,11 +528,8 @@
 					ts.buildCache( c );
 				}
 				$cell = ts.getClosest( $( this ), '.' + ts.css.header );
-				// reference original table headers and find the same cell
-				// don't use $headers or IE8 throws an error - see #987
-				temp = $headers.index( $cell );
-				c.last.clickedIndex = ( temp < 0 ) ? $cell.attr( 'data-column' ) : temp;
-				// use column index if $headers is undefined
+				// use column index from data-attribute or index of current row; fixes #1116
+				c.last.clickedIndex = $cell.attr( 'data-column' ) || $cell.index();
 				cell = c.$headers[ c.last.clickedIndex ];
 				if ( cell && !cell.sortDisabled ) {
 					ts.initSort( c, cell, e );
@@ -1410,7 +1407,7 @@
 			} else if (
 				!$row ||
 				// row is a jQuery object?
-				!( $row instanceof jQuery ) ||
+				!( $row instanceof $ ) ||
 				// row contained in the table?
 				( ts.getClosest( $row, 'table' )[ 0 ] !== c.table )
 			) {

dist/js/jquery.tablesorter.widgets.js

@@ -1,4 +1,4 @@
-/*! tablesorter (FORK) - updated 2018-03-19 (v2.30.1)*/
+/*! tablesorter (FORK) - updated 2018-04-26 (v2.30.2)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -2684,7 +2684,7 @@
 
 })(jQuery, window);
 
-/*! Widget: resizable - updated 2018-02-14 (v2.29.6) */
+/*! Widget: resizable - updated 2018-03-26 (v2.30.2) */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function ($, window) {
 	'use strict';
@@ -2854,7 +2854,8 @@
 				tableHeight -= c.$table.children('tfoot').height();
 			}
 			// subtract out table left position from resizable handles. Fixes #864
-			startPosition = c.$table.position().left;
+			// jQuery v3.3.0+ appears to include the start position with the $header.position().left; see #1544
+			startPosition = parseFloat($.fn.jquery) >= 3.3 ? 0 : c.$table.position().left;
 			$handles.each( function() {
 				var $this = $(this),
 					column = parseInt( $this.attr( 'data-column' ), 10 ),

js/jquery.tablesorter.combined.js

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀    ▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 2018-03-19 (v2.30.1)*/
+/*! tablesorter (FORK) - updated 2018-04-26 (v2.30.2)*/
 /* 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.1 *//*
+/*! TableSorter (FORK) v2.30.2 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -40,7 +40,7 @@
 	'use strict';
 	var ts = $.tablesorter = {
 
-		version : '2.30.1',
+		version : '2.30.2',
 
 		parsers : [],
 		widgets : [],
@@ -536,11 +536,8 @@
 					ts.buildCache( c );
 				}
 				$cell = ts.getClosest( $( this ), '.' + ts.css.header );
-				// reference original table headers and find the same cell
-				// don't use $headers or IE8 throws an error - see #987
-				temp = $headers.index( $cell );
-				c.last.clickedIndex = ( temp < 0 ) ? $cell.attr( 'data-column' ) : temp;
-				// use column index if $headers is undefined
+				// use column index from data-attribute or index of current row; fixes #1116
+				c.last.clickedIndex = $cell.attr( 'data-column' ) || $cell.index();
 				cell = c.$headers[ c.last.clickedIndex ];
 				if ( cell && !cell.sortDisabled ) {
 					ts.initSort( c, cell, e );
@@ -1418,7 +1415,7 @@
 			} else if (
 				!$row ||
 				// row is a jQuery object?
-				!( $row instanceof jQuery ) ||
+				!( $row instanceof $ ) ||
 				// row contained in the table?
 				( ts.getClosest( $row, 'table' )[ 0 ] !== c.table )
 			) {
@@ -5582,7 +5579,7 @@
 
 })(jQuery, window);
 
-/*! Widget: resizable - updated 2018-02-14 (v2.29.6) */
+/*! Widget: resizable - updated 2018-03-26 (v2.30.2) */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function ($, window) {
 	'use strict';
@@ -5752,7 +5749,8 @@
 				tableHeight -= c.$table.children('tfoot').height();
 			}
 			// subtract out table left position from resizable handles. Fixes #864
-			startPosition = c.$table.position().left;
+			// jQuery v3.3.0+ appears to include the start position with the $header.position().left; see #1544
+			startPosition = parseFloat($.fn.jquery) >= 3.3 ? 0 : c.$table.position().left;
 			$handles.each( function() {
 				var $this = $(this),
 					column = parseInt( $this.attr( 'data-column' ), 10 ),

js/jquery.tablesorter.js

@@ -1,4 +1,4 @@
-/*! TableSorter (FORK) v2.30.1 *//*
+/*! TableSorter (FORK) v2.30.2 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -22,7 +22,7 @@
 	'use strict';
 	var ts = $.tablesorter = {
 
-		version : '2.30.1',
+		version : '2.30.2',
 
 		parsers : [],
 		widgets : [],

js/jquery.tablesorter.widgets.js

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀    ▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 2018-03-19 (v2.30.1)*/
+/*! tablesorter (FORK) - updated 2018-04-26 (v2.30.2)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -2690,7 +2690,7 @@
 
 })(jQuery, window);
 
-/*! Widget: resizable - updated 2018-02-14 (v2.29.6) */
+/*! Widget: resizable - updated 2018-03-26 (v2.30.2) */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function ($, window) {
 	'use strict';
@@ -2860,7 +2860,8 @@
 				tableHeight -= c.$table.children('tfoot').height();
 			}
 			// subtract out table left position from resizable handles. Fixes #864
-			startPosition = c.$table.position().left;
+			// jQuery v3.3.0+ appears to include the start position with the $header.position().left; see #1544
+			startPosition = parseFloat($.fn.jquery) >= 3.3 ? 0 : c.$table.position().left;
 			$handles.each( function() {
 				var $this = $(this),
 					column = parseInt( $this.attr( 'data-column' ), 10 ),

js/widgets/widget-build-table.js

@@ -1,4 +1,4 @@
-/*! Widget: Build Table - updated 2018-04-19 (v2.30.1) *//*
+/*! Widget: Build Table - updated 2018-03-26 (v2.30.2) *//*
  * for tableSorter v2.16.0+
  * by Rob Garrison
  */

js/widgets/widget-pager.js

@@ -1,4 +1,4 @@
-/*! Widget: Pager - updated 2018-03-19 (v2.30.1) */
+/*! Widget: Pager - updated 2018-03-26 (v2.30.2) */
 /* Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */

js/widgets/widget-resizable.js

@@ -1,4 +1,4 @@
-/*! Widget: resizable - updated 2018-02-14 (v2.29.6) */
+/*! Widget: resizable - updated 2018-03-26 (v2.30.2) */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function ($, window) {
 	'use strict';

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tablesorter",
   "title": "tablesorter",
-  "version": "2.30.1",
+  "version": "2.30.2",
   "description": "tablesorter (FORK) is a jQuery plugin for turning a standard HTML table with THEAD and TBODY tags into a sortable table without page refreshes. tablesorter can successfully parse and sort many types of data including linked data in a cell.",
   "author": {
     "name": "Christian Bach",

tablesorter.jquery.json

@@ -1,7 +1,7 @@
 {
   "name": "tablesorter",
   "title": "tablesorter",
-  "version": "2.30.1",
+  "version": "2.30.2",
   "description": "tablesorter is a jQuery plugin for turning a standard HTML table with THEAD and TBODY tags into a sortable table without page refreshes. tablesorter can successfully parse and sort many types of data including linked data in a cell.\n\nThis forked version adds lots of new enhancements including: alphanumeric sorting, pager callback functons, multiple widgets providing column styling, ui theme application, sticky headers, column filters and resizer, as well as extended documentation with a lot more demos.",
   "author": {
     "name": "Christian Bach",