jquery-tablesorter 1.24.0 → 1.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd2f6d679b0523149759cc69b1b95cb25ca39e65
-  data.tar.gz: 86b19e6a3167c07baf0d90e3ab2d8993da19c625
+  metadata.gz: 8dc5f32cf7e88554cda49d8163dd0da7ac6bba98
+  data.tar.gz: 7aa178dd8b98beaeaf5c9c416eff90018ab2e71b
 SHA512:
-  metadata.gz: f26ac12515b165ac9e47c2cefac141a377a48f1d00be50f71bf62afc75a767d0b6ff795e3564f70465de4129119c9d3b81c2136d984edaced5fd2b9695bb6c55
-  data.tar.gz: bb9343e62a716614e84c5ba8f450d25af4d1c6e965e02fecc2a35b7ace98654f1e7ab5025a7f9f87421c3ff075d46caa0b630ae8ccf593076394338809bd423a
+  metadata.gz: 64d29329c00a4241270065248042d75eb8a8d452cbce5977bfcf0a068c6f2a0bb5174d0e2acaf30a06d401bc0165c392b4cabc1e18feedd00e113b170c48c461
+  data.tar.gz: f1f2323544c8ac076ce18b1bca88e2ccdb54e95cd4ff704d47a52b28926c80ab790ed6fc5a829e76ad2220b8dc68ca151ae676aae11511ea282eb95b686ca156

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jQuery tablesorter ([Mottie's fork]) into the asset pipeline.
 
-Current tablesorter version: 2.29.0 (9/27/2017) [documentation]
+Current tablesorter version: 2.29.2 (12/13/2017) [documentation]
 
 Any issue associated with the js/css files, please report to [Mottie's fork].
 

data/lib/jquery-tablesorter/version.rb

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

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

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀    ▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 09-27-2017 (v2.29.0)*/
+/*! tablesorter (FORK) - updated 12-13-2017 (v2.29.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.29.0 *//*
+/*! TableSorter (FORK) v2.29.2 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -40,7 +40,7 @@
 	'use strict';
 	var ts = $.tablesorter = {
 
-		version : '2.29.0',
+		version : '2.29.2',
 
 		parsers : [],
 		widgets : [],
@@ -532,8 +532,7 @@
 				if ( c.delayInit && ts.isEmptyObject( c.cache ) ) {
 					ts.buildCache( c );
 				}
-				// jQuery v1.2.6 doesn't have closest()
-				$cell = ts.getHeaderCell( $( this ) );
+				$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 );
@@ -573,10 +572,15 @@
 				'';
 			// redefine c.$headers here in case of an updateAll that replaces or adds an entire header cell - see #683
 			c.$headers = $( $.map( c.$table.find( c.selectorHeaders ), function( elem, index ) {
-				var configHeaders, header, column, template, tmp, $th,
+				var configHeaders, header, column, template, tmp,
 					$elem = $( elem );
 				// ignore cell (don't add it to c.$headers) if row has ignoreRow class
-				if ( $elem.parent().hasClass( c.cssIgnoreRow ) ) { return; }
+				if ( ts.getClosest( $elem, 'tr' ).hasClass( c.cssIgnoreRow ) ) { return; }
+				// transfer data-column to element if not th/td - #1459
+				if ( !/(th|td)/i.test( elem.nodeName ) ) {
+					tmp = ts.getClosest( $elem, 'th, td' );
+					$elem.attr( 'data-column', tmp.attr( 'data-column' ) );
+				}
 				// make sure to get header cell & not column indexed cell
 				configHeaders = ts.getColumnData( c.table, c.headers, index, true );
 				// save original header content
@@ -599,9 +603,7 @@
 				if ( c.onRenderHeader ) {
 					c.onRenderHeader.apply( $elem, [ index, c, c.$table ] );
 				}
-				// data-column stored on th or td only
-				$th = ts.getHeaderCell( $elem );
-				column = parseInt( $th.attr( 'data-column' ), 10 );
+				column = parseInt( $elem.attr( 'data-column' ), 10 );
 				elem.column = column;
 				tmp = ts.getOrder( ts.getData( $elem, configHeaders, 'sortInitialOrder' ) || c.sortInitialOrder );
 				// this may get updated numerous times if there are multiple rows
@@ -637,6 +639,7 @@
 				if ( ts.isEmptyObject( c.sortVars[ indx ] ) ) {
 					c.sortVars[ indx ] = {};
 				}
+				// Use c.$headers.parent() in case selectorHeaders doesn't point to the th/td
 				$temp = c.$headers.filter( '[data-column="' + indx + '"]' );
 				// target sortable column cells, unless there are none, then use non-sortable cells
 				// .last() added in jQuery 1.4; use .filter(':last') to maintain compatibility with jQuery v1.2.6
@@ -1100,6 +1103,15 @@
 				css = [ ts.css.sortAsc + ' ' + c.cssAsc, ts.css.sortDesc + ' ' + c.cssDesc ],
 				cssIcon = [ c.cssIconAsc, c.cssIconDesc, c.cssIconNone ],
 				aria = [ 'ascending', 'descending' ],
+				updateColumnSort = function($el, index) {
+					$el
+						.removeClass( none )
+						.addClass( css[ index ] )
+						.attr( 'aria-sort', aria[ index ] )
+						.find( '.' + ts.css.icon )
+						.removeClass( cssIcon[ 2 ] )
+						.addClass( cssIcon[ index ] );
+				},
 				// find the footer
 				$extras = c.$table
 					.find( 'tfoot tr' )
@@ -1138,7 +1150,7 @@
 						var include = true,
 							$el = c.$headers.eq( i ),
 							col = parseInt( $el.attr( 'data-column' ), 10 ),
-							end = col + c.$headers[ i ].colSpan;
+							end = col + ts.getClosest( $el, 'th, td' )[0].colSpan;
 						for ( ; col < end; col++ ) {
 							include = include ? include || ts.isValueInArray( col, c.sortList ) > -1 : false;
 						}
@@ -1152,23 +1164,13 @@
 					if ( $sorted.length ) {
 						for ( column = 0; column < $sorted.length; column++ ) {
 							if ( !$sorted[ column ].sortDisabled ) {
-								$sorted
-									.eq( column )
-									.removeClass( none )
-									.addClass( css[ list[ indx ][ 1 ] ] )
-									.attr( 'aria-sort', aria[ list[ indx ][ 1 ] ] )
-									.find( '.' + ts.css.icon )
-									.removeClass( cssIcon[ 2 ] )
-									.addClass( cssIcon[ list[ indx ][ 1 ] ] );
+								updateColumnSort( $sorted.eq( column ) , list[ indx ][ 1 ] );
 							}
 						}
-						// add sorted class to footer & extra headers, if they exist
-						if ( $extras.length ) {
-							$extras
-								.filter( '[data-column="' + list[ indx ][ 0 ] + '"]' )
-								.removeClass( none )
-								.addClass( css[ list[ indx ][ 1 ] ] );
-						}
+					}
+					// add sorted class to footer & extra headers, if they exist
+					if ( $extras.length ) {
+						updateColumnSort( $extras.filter( '[data-column="' + list[ indx ][ 0 ] + '"]' ), list[ indx ][ 1 ] );
 					}
 				}
 			}
@@ -1179,29 +1181,20 @@
 			}
 		},
 
-		// This function does NOT return closest if the $el matches the selector
 		getClosest : function( $el, selector ) {
-			return $.fn.closest ?
-				$el.closest( selector ) :
-				$el.parents( selector ).filter( ':first' );
-		},
-
-		getHeaderCell : function( $el ) {
 			// jQuery v1.2.6 doesn't have closest()
 			if ( $.fn.closest ) {
-				return $el.closest( 'th, td' );
+				return $el.closest( selector );
 			}
-			return /TH|TD/.test( $el[0].nodeName ) ?
+			return $el.is( selector ) ?
 				$el :
-				$el.parents( 'th, td' ).filter( ':first' );
+				$el.parents( selector ).filter( ':first' );
 		},
 
 		// nextSort (optional), lets you disable next sort text
 		setColumnAriaLabel : function( c, $header, nextSort ) {
 			if ( $header.length ) {
-				var $th = ts.getHeaderCell( $header ),
-					// data-column always stored on the th/td
-					column = parseInt( $th.attr( 'data-column' ), 10 ),
+				var column = parseInt( $header.attr( 'data-column' ), 10 ),
 					vars = c.sortVars[ column ],
 					tmp = $header.hasClass( ts.css.sortAsc ) ?
 						'sortAsc' :
@@ -1569,10 +1562,10 @@
 				notMultiSort = !event[ c.sortMultiSortKey ],
 				table = c.table,
 				len = c.$headers.length,
-				// get current column index; *always* stored on th/td
-				$th = ts.getHeaderCell( $( cell ) ),
-				col = parseInt( $th.attr( 'data-column' ), 10 ),
+				th = ts.getClosest( $( cell ), 'th, td' ),
+				col = parseInt( th.attr( 'data-column' ), 10 ),
 				order = c.sortVars[ col ].order;
+			th = th[0];
 			// Only call sortStart if sorting is enabled
 			c.$table.triggerHandler( 'sortStart', table );
 			// get current column sort order
@@ -1607,8 +1600,8 @@
 				if ( dir < 2 ) {
 					c.sortList[ c.sortList.length ] = [ col, dir ];
 					// add other columns if header spans across multiple
-					if ( cell.colSpan > 1 ) {
-						for ( indx = 1; indx < cell.colSpan; indx++ ) {
+					if ( th.colSpan > 1 ) {
+						for ( indx = 1; indx < th.colSpan; indx++ ) {
 							c.sortList[ c.sortList.length ] = [ col + indx, dir ];
 							// update count on columns in colSpan
 							c.sortVars[ col + indx ].count = $.inArray( dir, order );
@@ -1640,8 +1633,8 @@
 					if ( dir < 2 ) {
 						c.sortList[ c.sortList.length ] = [ col, dir ];
 						// add other columns if header spans across multiple
-						if ( cell.colSpan > 1 ) {
-							for ( indx = 1; indx < cell.colSpan; indx++ ) {
+						if ( th.colSpan > 1 ) {
+							for ( indx = 1; indx < th.colSpan; indx++ ) {
 								c.sortList[ c.sortList.length ] = [ col + indx, dir ];
 								// update count on columns in colSpan
 								c.sortVars[ col + indx ].count = $.inArray( dir, order );
@@ -2410,7 +2403,7 @@
 				$cells = ( $headers || c.$headers ),
 				// c.$headerIndexed is not defined initially
 				$cell = c.$headerIndexed && c.$headerIndexed[ indx ] ||
-					$cells.filter( '[data-column="' + indx + '"]:last' );
+					$cells.find( '[data-column="' + indx + '"]:last' );
 			if ( typeof obj[ indx ] !== 'undefined' ) {
 				return getCell ? obj[ indx ] : obj[ $cells.index( $cell ) ];
 			}
@@ -3295,7 +3288,7 @@
 
 })(jQuery);
 
-/*! Widget: filter - updated 7/4/2017 (v2.28.15) *//*
+/*! Widget: filter - updated 12/13/2017 (v2.29.1) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -4412,6 +4405,7 @@
 				if ( $.inArray( ffxn, vars.excludeMatch ) < 0 && matches === null ) {
 					matches = tsf.types[ffxn]( c, data, vars );
 					if ( matches !== null ) {
+						data.matchedOn = ffxn;
 						filterMatched = matches;
 					}
 				}
@@ -4459,6 +4453,7 @@
 					tsf.multipleColumns( c, wo.filter_$anyMatch ) :
 					[];
 			data.$cells = data.$row.children();
+			data.matchedOn = null;
 			if ( data.anyMatchFlag && columnIndex.length > 1 || ( data.anyMatchFilter && !hasAnyMatchInput ) ) {
 				data.anyMatch = true;
 				data.isMatch = true;
@@ -4560,7 +4555,9 @@
 						// cycle through the different filters
 						// filters return a boolean or null if nothing matches
 						filterMatched = tsf.processTypes( c, data, vars );
-						if ( filterMatched !== null ) {
+						// select with exact match; ignore "and" or "or" within the text; fixes #1486
+						txt = fxn === true && (data.matchedOn === 'and' || data.matchedOn === 'or');
+						if ( filterMatched !== null && !txt) {
 							result = filterMatched;
 						// Look for match, and add child row data for matching
 						} else {
@@ -5542,7 +5539,7 @@
 
 })(jQuery, window);
 
-/*! Widget: resizable - updated 9/27/2017 (v2.29.0) */
+/*! Widget: resizable - updated 12/13/2017 (v2.29.1) */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function ($, window) {
 	'use strict';
@@ -5719,7 +5716,10 @@
 					columns = c.columns - 1,
 					$header = $this.data( 'header' );
 				if ( !$header ) { return; } // see #859
-				if ( !$header.is(':visible') ) {
+				if (
+					!$header.is(':visible') ||
+					( !wo.resizable_addLastColumn && ts.resizable.checkVisibleColumns(c, column) )
+				) {
 					$this.hide();
 				} else if ( column < columns || column === columns && wo.resizable_addLastColumn ) {
 					$this.css({
@@ -5731,6 +5731,16 @@
 			});
 		},
 
+		// Fixes #1485
+		checkVisibleColumns: function( c, column ) {
+			var i,
+				len = 0;
+			for ( i = column + 1; i < c.columns; i++ ) {
+				len += c.$headerIndexed[i].is( ':visible' ) ? 1 : 0;
+			}
+			return len === 0;
+		},
+
 		// prevent text selection while dragging resize bar
 		toggleTextSelection : function( c, wo, toggle ) {
 			var namespace = c.namespace + 'tsresize';

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

@@ -1,4 +1,4 @@
-/*! TableSorter (FORK) v2.29.0 *//*
+/*! TableSorter (FORK) v2.29.2 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -22,7 +22,7 @@
 	'use strict';
 	var ts = $.tablesorter = {
 
-		version : '2.29.0',
+		version : '2.29.2',
 
 		parsers : [],
 		widgets : [],
@@ -514,8 +514,7 @@
 				if ( c.delayInit && ts.isEmptyObject( c.cache ) ) {
 					ts.buildCache( c );
 				}
-				// jQuery v1.2.6 doesn't have closest()
-				$cell = ts.getHeaderCell( $( this ) );
+				$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 );
@@ -555,10 +554,15 @@
 				'';
 			// redefine c.$headers here in case of an updateAll that replaces or adds an entire header cell - see #683
 			c.$headers = $( $.map( c.$table.find( c.selectorHeaders ), function( elem, index ) {
-				var configHeaders, header, column, template, tmp, $th,
+				var configHeaders, header, column, template, tmp,
 					$elem = $( elem );
 				// ignore cell (don't add it to c.$headers) if row has ignoreRow class
-				if ( $elem.parent().hasClass( c.cssIgnoreRow ) ) { return; }
+				if ( ts.getClosest( $elem, 'tr' ).hasClass( c.cssIgnoreRow ) ) { return; }
+				// transfer data-column to element if not th/td - #1459
+				if ( !/(th|td)/i.test( elem.nodeName ) ) {
+					tmp = ts.getClosest( $elem, 'th, td' );
+					$elem.attr( 'data-column', tmp.attr( 'data-column' ) );
+				}
 				// make sure to get header cell & not column indexed cell
 				configHeaders = ts.getColumnData( c.table, c.headers, index, true );
 				// save original header content
@@ -581,9 +585,7 @@
 				if ( c.onRenderHeader ) {
 					c.onRenderHeader.apply( $elem, [ index, c, c.$table ] );
 				}
-				// data-column stored on th or td only
-				$th = ts.getHeaderCell( $elem );
-				column = parseInt( $th.attr( 'data-column' ), 10 );
+				column = parseInt( $elem.attr( 'data-column' ), 10 );
 				elem.column = column;
 				tmp = ts.getOrder( ts.getData( $elem, configHeaders, 'sortInitialOrder' ) || c.sortInitialOrder );
 				// this may get updated numerous times if there are multiple rows
@@ -619,6 +621,7 @@
 				if ( ts.isEmptyObject( c.sortVars[ indx ] ) ) {
 					c.sortVars[ indx ] = {};
 				}
+				// Use c.$headers.parent() in case selectorHeaders doesn't point to the th/td
 				$temp = c.$headers.filter( '[data-column="' + indx + '"]' );
 				// target sortable column cells, unless there are none, then use non-sortable cells
 				// .last() added in jQuery 1.4; use .filter(':last') to maintain compatibility with jQuery v1.2.6
@@ -1082,6 +1085,15 @@
 				css = [ ts.css.sortAsc + ' ' + c.cssAsc, ts.css.sortDesc + ' ' + c.cssDesc ],
 				cssIcon = [ c.cssIconAsc, c.cssIconDesc, c.cssIconNone ],
 				aria = [ 'ascending', 'descending' ],
+				updateColumnSort = function($el, index) {
+					$el
+						.removeClass( none )
+						.addClass( css[ index ] )
+						.attr( 'aria-sort', aria[ index ] )
+						.find( '.' + ts.css.icon )
+						.removeClass( cssIcon[ 2 ] )
+						.addClass( cssIcon[ index ] );
+				},
 				// find the footer
 				$extras = c.$table
 					.find( 'tfoot tr' )
@@ -1120,7 +1132,7 @@
 						var include = true,
 							$el = c.$headers.eq( i ),
 							col = parseInt( $el.attr( 'data-column' ), 10 ),
-							end = col + c.$headers[ i ].colSpan;
+							end = col + ts.getClosest( $el, 'th, td' )[0].colSpan;
 						for ( ; col < end; col++ ) {
 							include = include ? include || ts.isValueInArray( col, c.sortList ) > -1 : false;
 						}
@@ -1134,23 +1146,13 @@
 					if ( $sorted.length ) {
 						for ( column = 0; column < $sorted.length; column++ ) {
 							if ( !$sorted[ column ].sortDisabled ) {
-								$sorted
-									.eq( column )
-									.removeClass( none )
-									.addClass( css[ list[ indx ][ 1 ] ] )
-									.attr( 'aria-sort', aria[ list[ indx ][ 1 ] ] )
-									.find( '.' + ts.css.icon )
-									.removeClass( cssIcon[ 2 ] )
-									.addClass( cssIcon[ list[ indx ][ 1 ] ] );
+								updateColumnSort( $sorted.eq( column ) , list[ indx ][ 1 ] );
 							}
 						}
-						// add sorted class to footer & extra headers, if they exist
-						if ( $extras.length ) {
-							$extras
-								.filter( '[data-column="' + list[ indx ][ 0 ] + '"]' )
-								.removeClass( none )
-								.addClass( css[ list[ indx ][ 1 ] ] );
-						}
+					}
+					// add sorted class to footer & extra headers, if they exist
+					if ( $extras.length ) {
+						updateColumnSort( $extras.filter( '[data-column="' + list[ indx ][ 0 ] + '"]' ), list[ indx ][ 1 ] );
 					}
 				}
 			}
@@ -1161,29 +1163,20 @@
 			}
 		},
 
-		// This function does NOT return closest if the $el matches the selector
 		getClosest : function( $el, selector ) {
-			return $.fn.closest ?
-				$el.closest( selector ) :
-				$el.parents( selector ).filter( ':first' );
-		},
-
-		getHeaderCell : function( $el ) {
 			// jQuery v1.2.6 doesn't have closest()
 			if ( $.fn.closest ) {
-				return $el.closest( 'th, td' );
+				return $el.closest( selector );
 			}
-			return /TH|TD/.test( $el[0].nodeName ) ?
+			return $el.is( selector ) ?
 				$el :
-				$el.parents( 'th, td' ).filter( ':first' );
+				$el.parents( selector ).filter( ':first' );
 		},
 
 		// nextSort (optional), lets you disable next sort text
 		setColumnAriaLabel : function( c, $header, nextSort ) {
 			if ( $header.length ) {
-				var $th = ts.getHeaderCell( $header ),
-					// data-column always stored on the th/td
-					column = parseInt( $th.attr( 'data-column' ), 10 ),
+				var column = parseInt( $header.attr( 'data-column' ), 10 ),
 					vars = c.sortVars[ column ],
 					tmp = $header.hasClass( ts.css.sortAsc ) ?
 						'sortAsc' :
@@ -1551,10 +1544,10 @@
 				notMultiSort = !event[ c.sortMultiSortKey ],
 				table = c.table,
 				len = c.$headers.length,
-				// get current column index; *always* stored on th/td
-				$th = ts.getHeaderCell( $( cell ) ),
-				col = parseInt( $th.attr( 'data-column' ), 10 ),
+				th = ts.getClosest( $( cell ), 'th, td' ),
+				col = parseInt( th.attr( 'data-column' ), 10 ),
 				order = c.sortVars[ col ].order;
+			th = th[0];
 			// Only call sortStart if sorting is enabled
 			c.$table.triggerHandler( 'sortStart', table );
 			// get current column sort order
@@ -1589,8 +1582,8 @@
 				if ( dir < 2 ) {
 					c.sortList[ c.sortList.length ] = [ col, dir ];
 					// add other columns if header spans across multiple
-					if ( cell.colSpan > 1 ) {
-						for ( indx = 1; indx < cell.colSpan; indx++ ) {
+					if ( th.colSpan > 1 ) {
+						for ( indx = 1; indx < th.colSpan; indx++ ) {
 							c.sortList[ c.sortList.length ] = [ col + indx, dir ];
 							// update count on columns in colSpan
 							c.sortVars[ col + indx ].count = $.inArray( dir, order );
@@ -1622,8 +1615,8 @@
 					if ( dir < 2 ) {
 						c.sortList[ c.sortList.length ] = [ col, dir ];
 						// add other columns if header spans across multiple
-						if ( cell.colSpan > 1 ) {
-							for ( indx = 1; indx < cell.colSpan; indx++ ) {
+						if ( th.colSpan > 1 ) {
+							for ( indx = 1; indx < th.colSpan; indx++ ) {
 								c.sortList[ c.sortList.length ] = [ col + indx, dir ];
 								// update count on columns in colSpan
 								c.sortVars[ col + indx ].count = $.inArray( dir, order );
@@ -2392,7 +2385,7 @@
 				$cells = ( $headers || c.$headers ),
 				// c.$headerIndexed is not defined initially
 				$cell = c.$headerIndexed && c.$headerIndexed[ indx ] ||
-					$cells.filter( '[data-column="' + indx + '"]:last' );
+					$cells.find( '[data-column="' + indx + '"]:last' );
 			if ( typeof obj[ indx ] !== 'undefined' ) {
 				return getCell ? obj[ indx ] : obj[ $cells.index( $cell ) ];
 			}

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

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀    ▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 09-27-2017 (v2.29.0)*/
+/*! tablesorter (FORK) - updated 12-13-2017 (v2.29.2)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -408,7 +408,7 @@
 
 })(jQuery);
 
-/*! Widget: filter - updated 7/4/2017 (v2.28.15) *//*
+/*! Widget: filter - updated 12/13/2017 (v2.29.1) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -1525,6 +1525,7 @@
 				if ( $.inArray( ffxn, vars.excludeMatch ) < 0 && matches === null ) {
 					matches = tsf.types[ffxn]( c, data, vars );
 					if ( matches !== null ) {
+						data.matchedOn = ffxn;
 						filterMatched = matches;
 					}
 				}
@@ -1572,6 +1573,7 @@
 					tsf.multipleColumns( c, wo.filter_$anyMatch ) :
 					[];
 			data.$cells = data.$row.children();
+			data.matchedOn = null;
 			if ( data.anyMatchFlag && columnIndex.length > 1 || ( data.anyMatchFilter && !hasAnyMatchInput ) ) {
 				data.anyMatch = true;
 				data.isMatch = true;
@@ -1673,7 +1675,9 @@
 						// cycle through the different filters
 						// filters return a boolean or null if nothing matches
 						filterMatched = tsf.processTypes( c, data, vars );
-						if ( filterMatched !== null ) {
+						// select with exact match; ignore "and" or "or" within the text; fixes #1486
+						txt = fxn === true && (data.matchedOn === 'and' || data.matchedOn === 'or');
+						if ( filterMatched !== null && !txt) {
 							result = filterMatched;
 						// Look for match, and add child row data for matching
 						} else {
@@ -2655,7 +2659,7 @@
 
 })(jQuery, window);
 
-/*! Widget: resizable - updated 9/27/2017 (v2.29.0) */
+/*! Widget: resizable - updated 12/13/2017 (v2.29.1) */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function ($, window) {
 	'use strict';
@@ -2832,7 +2836,10 @@
 					columns = c.columns - 1,
 					$header = $this.data( 'header' );
 				if ( !$header ) { return; } // see #859
-				if ( !$header.is(':visible') ) {
+				if (
+					!$header.is(':visible') ||
+					( !wo.resizable_addLastColumn && ts.resizable.checkVisibleColumns(c, column) )
+				) {
 					$this.hide();
 				} else if ( column < columns || column === columns && wo.resizable_addLastColumn ) {
 					$this.css({
@@ -2844,6 +2851,16 @@
 			});
 		},
 
+		// Fixes #1485
+		checkVisibleColumns: function( c, column ) {
+			var i,
+				len = 0;
+			for ( i = column + 1; i < c.columns; i++ ) {
+				len += c.$headerIndexed[i].is( ':visible' ) ? 1 : 0;
+			}
+			return len === 0;
+		},
+
 		// prevent text selection while dragging resize bar
 		toggleTextSelection : function( c, wo, toggle ) {
 			var namespace = c.namespace + 'tsresize';

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

@@ -1,4 +1,4 @@
-/*! Widget: filter - updated 7/4/2017 (v2.28.15) *//*
+/*! Widget: filter - updated 12/13/2017 (v2.29.1) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -1115,6 +1115,7 @@
 				if ( $.inArray( ffxn, vars.excludeMatch ) < 0 && matches === null ) {
 					matches = tsf.types[ffxn]( c, data, vars );
 					if ( matches !== null ) {
+						data.matchedOn = ffxn;
 						filterMatched = matches;
 					}
 				}
@@ -1162,6 +1163,7 @@
 					tsf.multipleColumns( c, wo.filter_$anyMatch ) :
 					[];
 			data.$cells = data.$row.children();
+			data.matchedOn = null;
 			if ( data.anyMatchFlag && columnIndex.length > 1 || ( data.anyMatchFilter && !hasAnyMatchInput ) ) {
 				data.anyMatch = true;
 				data.isMatch = true;
@@ -1263,7 +1265,9 @@
 						// cycle through the different filters
 						// filters return a boolean or null if nothing matches
 						filterMatched = tsf.processTypes( c, data, vars );
-						if ( filterMatched !== null ) {
+						// select with exact match; ignore "and" or "or" within the text; fixes #1486
+						txt = fxn === true && (data.matchedOn === 'and' || data.matchedOn === 'or');
+						if ( filterMatched !== null && !txt) {
 							result = filterMatched;
 						// Look for match, and add child row data for matching
 						} else {

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

@@ -1,4 +1,4 @@
-/*! Widget: resizable - updated 9/27/2017 (v2.29.0) */
+/*! Widget: resizable - updated 12/13/2017 (v2.29.1) */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function ($, window) {
 	'use strict';
@@ -175,7 +175,10 @@
 					columns = c.columns - 1,
 					$header = $this.data( 'header' );
 				if ( !$header ) { return; } // see #859
-				if ( !$header.is(':visible') ) {
+				if (
+					!$header.is(':visible') ||
+					( !wo.resizable_addLastColumn && ts.resizable.checkVisibleColumns(c, column) )
+				) {
 					$this.hide();
 				} else if ( column < columns || column === columns && wo.resizable_addLastColumn ) {
 					$this.css({
@@ -187,6 +190,16 @@
 			});
 		},
 
+		// Fixes #1485
+		checkVisibleColumns: function( c, column ) {
+			var i,
+				len = 0;
+			for ( i = column + 1; i < c.columns; i++ ) {
+				len += c.$headerIndexed[i].is( ':visible' ) ? 1 : 0;
+			}
+			return len === 0;
+		},
+
 		// prevent text selection while dragging resize bar
 		toggleTextSelection : function( c, wo, toggle ) {
 			var namespace = c.namespace + 'tsresize';

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

@@ -1,4 +1,4 @@
-/*! Widget: scroller - updated 9/27/2017 (v2.29.0) *//*
+/*! Widget: scroller - updated 12/13/2017 (v2.29.1) *//*
 	Copyright (C) 2011 T. Connell & Associates, Inc.
 
 	Dual-licensed under the MIT and GPL licenses
@@ -289,8 +289,10 @@
 				});
 
 			// resize/update events - filterEnd fires after "tablesorter-initialized" and "updateComplete"
-			events = ( ( ts.hasWidget( c.table, 'filter' ) ? 'filterEnd' : 'tablesorter-initialized updateComplete' ) +
-					' sortEnd pagerComplete columnUpdate ' ).split( ' ' ).join( namespace + ' ' );
+			tmp = ts.hasWidget( c.table, 'filter' ) ?
+				'filterEnd filterInit' :
+				'tablesorter-initialized updateComplete';
+			events = ( tmp + ' sortEnd pagerComplete columnUpdate ' ).split( ' ' ).join( namespace + ' ' );
 
 			$table
 				.off( namespace )

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

@@ -0,0 +1,137 @@
+/*! Widget: vertical-group (BETA) - updated 12/13/2017 (v2.29.1) */
+/* Requires tablesorter and jQuery 
+ * Originally by @aavmurphy (Andrew Murphy)
+ * Adapted for tablesorter by Rob Garrison - see #1469 & #1470
+ *
+ * This widget is licensed under the same terms at mottie/tablesorter itself, i.e. free to use
+ */
+/* jshint browser:true, jquery:true, unused:false */
+/* global jQuery:false */
+;(function($){
+	'use strict';
+
+	var ts = $.tablesorter,
+		tscss = ts.css;
+
+	$.extend( ts.css, {
+		verticalGroupHeader: 'tablesorter-vertical-group',
+		verticalGroupHide:   'tablesorter-vertical-group-hide',
+		verticalGroupShow:   'tablesorter-vertical-group-show'
+	});
+
+	ts.addWidget({ 
+		id: 'vertical-group', 
+		priority: 99,
+		init: verticalGroup,
+		format: verticalGroup 
+	});
+
+	function cleanUp( el ) {
+		el.removeClass(tscss.verticalGroupHide + ' ' + tscss.verticalGroupShow);
+	}
+
+	function setZebra( wo, $cell, indx ) {
+		var $row = $cell.parent();
+		$row
+			.removeClass( wo.zebra[ (indx + 1) % 2 ] )
+			.addClass( wo.zebra[ indx % 2] );
+	}
+
+	function verticalGroup( table, c, wo, init ) {
+		// -------------------------------------------------------------------------
+		// loop thru the header row,
+		//    - look for .vertical-group
+		//
+		// loop thru the rows
+		//
+		//    set ALWAYS_SHOW = FALSE
+		//    loop thru the 1st 4 columns
+		//      if this cell does not exist, skip to next row
+		//      if ALWAYS_SHOW, then this cell is SHOW
+		//      else if this column does not have '.vertical-group', then this cell is SHOW
+		//      else if this cell is NOT the same as the cell-above, then this cell is SHOW
+		//      else this cell is HIDE
+		//      if this cell is SHOW, set ALWAYS_SHOW 
+		//      if this cell is SHOW, 
+		//      then 
+		//        set the cell class to .vertical_group_show
+		//      else
+		//        set the cell class to vertical_group_show
+		//
+		//      TO DO add/remove classes so as not to clobber other existing classes
+		//      TO DO add classes
+		//
+		//        .vertical-group-show { background-color: white !important; }
+		//        .vertical-group-hide { visibility: hidden; border-top: white !important;background-color: white !important; }
+		//
+		//        this is all because of stripped tables
+		//          - background-colour show be the table's background colour (or the first row's)
+		//          - the border-color needs to be the same
+		//
+		// ------------------------------------------------------------------------------------------------
+		var tmp,
+			zebra_index = -1, // increments at start of loop
+			rows = table.tBodies[0].rows,
+			header = table.tHead.rows,
+			has_zebra = ts.hasWidget( table, 'zebra'),
+			is_vertical_group_col = [],
+			last_row = [];
+
+		if ( wo.vertical_group_lock ) {
+			return;
+		}
+		wo.vertical_group_lock = true;
+
+		is_vertical_group_col = $.map( c.$headerIndexed, function( el ) {
+			return el.hasClass( tscss.verticalGroupHeader ) ? 1 : '';
+		});
+
+		if ( is_vertical_group_col.join('') === '' ) {
+			cleanUp( $(rows).find( '.' + tscss.verticalGroupHide + ',.' + tscss.verticalGroupShow ) );
+			wo.vertical_group_lock = false;
+			return;
+		}
+
+		for (var i = 0; i < rows.length; i++) {
+			var always_show_cell = false;
+
+			for (var j = 0; j < c.columns; j++ ) {
+				if ( !is_vertical_group_col[ j ] || !rows[ i ].cells[ j ] ) {
+					zebra_index++;
+					continue;
+				}
+
+				var $cell = $( rows[ i ].cells[ j ] ),
+					// only group if column is sorted
+					isSorted = ts.isValueInArray( j, c.sortList ), // returns equivalent of an indexOf value
+					cell_data = $cell.html();
+
+				if ( isSorted < 0 ) {
+					cleanUp( $cell );
+				} else if ( !always_show_cell && cell_data === last_row[j] ) {
+					if ( !$cell.hasClass(tscss.verticalGroupHide) ) {
+						$cell.addClass( tscss.verticalGroupHide );
+					}
+					if ( has_zebra ) {
+						setZebra( wo, $cell, zebra_index );
+					}
+					$cell.removeClass( tscss.verticalGroupShow );
+				} else if (isSorted === 0) {
+					// only show cells from the first sorted column
+					always_show_cell = true; // show
+					if ( !$cell.hasClass( tscss.verticalGroupShow ) ) {
+						$cell.addClass( tscss.verticalGroupShow );
+					}
+					$cell.removeClass( tscss.verticalGroupHide );
+					if ( has_zebra ) {
+						// only adjust striping based on the first sorted column
+						setZebra( wo, $cell, isSorted ? zebra_index : ++zebra_index );
+					}
+				}
+				last_row[j] = cell_data;
+			}
+		}
+		wo.vertical_group_lock = false;
+	}
+
+})(jQuery);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.24.1
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -142,6 +142,7 @@ files:
 - vendor/assets/javascripts/jquery-tablesorter/widgets/widget-storage.js
 - vendor/assets/javascripts/jquery-tablesorter/widgets/widget-toggle.js
 - vendor/assets/javascripts/jquery-tablesorter/widgets/widget-uitheme.js
+- vendor/assets/javascripts/jquery-tablesorter/widgets/widget-vertical-group.js
 - vendor/assets/javascripts/jquery-tablesorter/widgets/widget-view.js
 - vendor/assets/stylesheets/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.css
 - vendor/assets/stylesheets/jquery-tablesorter/dragtable.mod.css