jquery-tablesorter 1.21.3 → 1.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb62c8ab5ad34f27a1f4bd10790a80d3c0e373c7
-  data.tar.gz: 6d530e5d1c5d208a24ef2a2139dc38d9e74353a4
+  metadata.gz: 00d5cfb816cce8b645193c850e6ae99698cb2516
+  data.tar.gz: 5af380402f10f667792a92c6fff45c6675ad963b
 SHA512:
-  metadata.gz: 3f9c35ae24b81cf21f905c2d7cc74d845258dc385bec0fd273673b61e728dddfb8c7f21b640dd5f9c237512f67d82f384665c9dff0efd49e59a3ae6474d8ab79
-  data.tar.gz: 4077aee386ff83dc67dd9398dd347c49cac084975a0218f1c147718d9a295cd75de4840b02beee2e28730f2ad650956238ebd13693aa26ee4028a52c9655c24b
+  metadata.gz: 910fb98292ba03abcbe9936aa464912c2c320665aed95906e681ce9ea07ee60c398be04b65094cc743518c99e3dbc83cb3deaa2f987affc5d65176601028d5f3
+  data.tar.gz: c40b9a23019d3ef3d0ec431f50c6ef2bef63f5fb375257f36d50d6baeb425b15b5cc1b69453fb9015e405d0fcb962cbe20c71a27340090865c2a19efe6ca6670

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.26.5 (6/28/2016), [documentation]
+Current tablesorter version: 2.26.6 (7/11/2016), [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 = 21
-  TINY  = 3
+  TINY  = 4
 
   VERSION = [MAJOR, MINOR, TINY].compact.join('.')
 end

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

@@ -1,6 +1,6 @@
 /*!
 * tablesorter (FORK) pager plugin
-* updated 6/28/2015 (v2.26.5)
+* updated 7/11/2016 (v2.26.6)
 */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($) {
@@ -783,7 +783,7 @@
 			// set to either set or get value
 			parsePageSize = function( p, size, mode ) {
 				var s = parseInt( size, 10 ) || p.size || p.settings.size || 10;
-				return /all/i.test( size ) || s === p.totalRows ?
+				return p.initialized && (/all/i.test( size ) || s === p.totalRows) ?
 				// "get" to get `p.size` or "set" to set `p.$size.val()`
 				'all' : ( mode === 'get' ? s : p.size );
 			},

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

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀    ▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 06-28-2016 (v2.26.5)*/
+/*! tablesorter (FORK) - updated 07-11-2016 (v2.26.6)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -16,7 +16,7 @@
 	}
 }(function($) {
 
-/*! TableSorter (FORK) v2.26.5 *//*
+/*! TableSorter (FORK) v2.26.6 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -39,7 +39,7 @@
 	'use strict';
 	var ts = $.tablesorter = {
 
-		version : '2.26.5',
+		version : '2.26.6',
 
 		parsers : [],
 		widgets : [],
@@ -1777,14 +1777,14 @@
 				regex = ts.regex;
 			// first try and sort Hex codes
 			if ( regex.hex.test( b ) ) {
-				aNum = parseInt( a.match( regex.hex ), 16 );
-				bNum = parseInt( b.match( regex.hex ), 16 );
+				aNum = parseInt( ( a || '' ).match( regex.hex ), 16 );
+				bNum = parseInt( ( b || '' ).match( regex.hex ), 16 );
 				if ( aNum < bNum ) { return -1; }
 				if ( aNum > bNum ) { return 1; }
 			}
 			// chunk/tokenize
-			aNum = a.replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
-			bNum = b.replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
+			aNum = ( a || '' ).replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
+			bNum = ( b || '' ).replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
 			max = Math.max( aNum.length, bNum.length );
 			// natural sorting through split numeric strings and default strings
 			for ( indx = 0; indx < max; indx++ ) {
@@ -2839,7 +2839,7 @@
 
 })(jQuery, window, document);
 
-/*! Widget: uitheme - updated 3/26/2015 (v2.21.3) */
+/*! Widget: uitheme - updated 7/11/2016 (v2.26.6) */
 ;(function ($) {
 	'use strict';
 	var ts = $.tablesorter || {};
@@ -2897,7 +2897,7 @@
 		id: 'uitheme',
 		priority: 10,
 		format: function(table, c, wo) {
-			var i, hdr, icon, time, $header, $icon, $tfoot, $h, oldtheme, oldremove, oldIconRmv, hasOldTheme,
+			var i, tmp, hdr, icon, time, $header, $icon, $tfoot, $h, oldtheme, oldremove, oldIconRmv, hasOldTheme,
 				themesAll = ts.themes,
 				$table = c.$table.add( $( c.namespace + '_extra_table' ) ),
 				$headers = c.$headers.add( $( c.namespace + '_extra_headers' ) ),
@@ -2964,10 +2964,20 @@
 						.removeClass(hasOldTheme ? [ oldtheme.icons, oldIconRmv ].join(' ') : '')
 						.addClass(themes.icons || '');
 				}
-				if ($table.hasClass('hasFilters')) {
-					$table.children('thead').children('.' + ts.css.filterRow)
-						.removeClass(hasOldTheme ? oldtheme.filterRow || '' : '')
-						.addClass(themes.filterRow || '');
+				// filter widget initializes after uitheme
+				if (c.widgets.indexOf('filter') > -1) {
+					tmp = function() {
+						$table.children('thead').children('.' + ts.css.filterRow)
+							.removeClass(hasOldTheme ? oldtheme.filterRow || '' : '')
+							.addClass(themes.filterRow || '');
+					};
+					if (wo.filter_initialized) {
+						tmp();
+					} else {
+						$table.one('filterInit', function() {
+							tmp();
+						});
+					}
 				}
 			}
 			for (i = 0; i < c.columns; i++) {
@@ -3104,7 +3114,7 @@
 
 })(jQuery);
 
-/*! Widget: filter - updated 6/28/2015 (v2.26.5) *//*
+/*! Widget: filter - updated 7/11/2016 (v2.26.6) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -3891,12 +3901,13 @@
 			.attr( 'data-lastSearchTime', new Date().getTime() )
 			.unbind( tmp.replace( ts.regex.spaces, ' ' ) )
 			.bind( 'keydown' + namespace, function( event ) {
-				if ( event.which === tskeyCodes.escape && !wo.filter_resetOnEsc ) {
+				if ( event.which === tskeyCodes.escape && !table.config.widgetOptions.filter_resetOnEsc ) {
 					// prevent keypress event
 					return false;
 				}
 			})
 			.bind( 'keyup' + namespace, function( event ) {
+				wo = table.config.widgetOptions; // make sure "wo" isn't cached
 				var column = parseInt( $( this ).attr( 'data-column' ), 10 );
 				$( this ).attr( 'data-lastSearchTime', new Date().getTime() );
 				// emulate what webkit does.... escape clears the filter
@@ -3923,7 +3934,8 @@
 				// don't get cached data, in case data-column changes dynamically
 				var column = parseInt( $( this ).attr( 'data-column' ), 10 );
 				// don't allow 'change' event to process if the input value is the same - fixes #685
-				if ( wo.filter_initialized && ( event.which === tskeyCodes.enter || event.type === 'search' ||
+				if ( table.config.widgetOptions.filter_initialized &&
+					( event.which === tskeyCodes.enter || event.type === 'search' ||
 					( event.type === 'change' ) && this.value !== c.lastSearch[column] ) ||
 					// only "input" event fires in MS Edge when clicking the "x" to clear the search
 					( event.type === 'input' && this.value === '' ) ) {
@@ -3972,7 +3984,7 @@
 				// show/hide filter row as needed
 				c.$table
 					.find( '.' + tscss.filterRow )
-					.triggerHandler( combinedFilters === '' ? 'mouseleave' : 'mouseenter' );
+					.triggerHandler( tsf.hideFiltersCheck( c ) ? 'mouseleave' : 'mouseenter' );
 			}
 			// return if the last search is the same; but filter === false when updating the search
 			// see example-widget-filter.html filter toggle buttons
@@ -4005,26 +4017,34 @@
 				return false;
 			}
 		},
+		hideFiltersCheck: function( c ) {
+			if (typeof c.widgetOptions.filter_hideFilters === 'function') {
+				var val = c.widgetOptions.filter_hideFilters( c );
+				if (typeof val === 'boolean') {
+					return val;
+				}
+			}
+			return ts.getFilters( c.$table ).join( '' ) === '';
+		},
 		hideFilters: function( c, $table ) {
-			var timer,
-				$row = ( $table || c.$table ).find( '.' + tscss.filterRow ).addClass( tscss.filterRowHide );
-			$row
+			var timer;
+			( $table || c.$table )
+				.find( '.' + tscss.filterRow )
+				.addClass( tscss.filterRowHide )
 				.bind( 'mouseenter mouseleave', function( e ) {
 					// save event object - http://bugs.jquery.com/ticket/12140
 					var event = e,
-						$filterRow = $( this );
+						$row = $( this );
 					clearTimeout( timer );
 					timer = setTimeout( function() {
 						if ( /enter|over/.test( event.type ) ) {
-							$filterRow.removeClass( tscss.filterRowHide );
+							$row.removeClass( tscss.filterRowHide );
 						} else {
 							// don't hide if input has focus
 							// $( ':focus' ) needs jQuery 1.6+
-							if ( $( document.activeElement ).closest( 'tr' )[0] !== $filterRow[0] ) {
+							if ( $( document.activeElement ).closest( 'tr' )[0] !== $row[0] ) {
 								// don't hide row if any filter has a value
-								if ( c.lastCombinedFilter === '' ) {
-									$filterRow.addClass( tscss.filterRowHide );
-								}
+								$row.toggleClass( tscss.filterRowHide, tsf.hideFiltersCheck( c ) );
 							}
 						}
 					}, 200 );
@@ -4036,9 +4056,7 @@
 					timer = setTimeout( function() {
 						clearTimeout( timer );
 						// don't hide row if any filter has a value
-						if ( ts.getFilters( c.$table ).join( '' ) === '' ) {
-							$row.toggleClass( tscss.filterRowHide, event.type !== 'focus' );
-						}
+						$row.toggleClass( tscss.filterRowHide, tsf.hideFiltersCheck( c ) && event.type !== 'focus' );
 					}, 200 );
 				});
 		},
@@ -5232,7 +5250,7 @@
 
 })(jQuery, window);
 
-/*! Widget: resizable - updated 6/28/2015 (v2.26.5) */
+/*! Widget: resizable - updated 6/28/2016 (v2.26.5) */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function ($, window) {
 	'use strict';

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

@@ -1,4 +1,4 @@
-/*! TableSorter (FORK) v2.26.5 *//*
+/*! TableSorter (FORK) v2.26.6 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -21,7 +21,7 @@
 	'use strict';
 	var ts = $.tablesorter = {
 
-		version : '2.26.5',
+		version : '2.26.6',
 
 		parsers : [],
 		widgets : [],
@@ -1759,14 +1759,14 @@
 				regex = ts.regex;
 			// first try and sort Hex codes
 			if ( regex.hex.test( b ) ) {
-				aNum = parseInt( a.match( regex.hex ), 16 );
-				bNum = parseInt( b.match( regex.hex ), 16 );
+				aNum = parseInt( ( a || '' ).match( regex.hex ), 16 );
+				bNum = parseInt( ( b || '' ).match( regex.hex ), 16 );
 				if ( aNum < bNum ) { return -1; }
 				if ( aNum > bNum ) { return 1; }
 			}
 			// chunk/tokenize
-			aNum = a.replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
-			bNum = b.replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
+			aNum = ( a || '' ).replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
+			bNum = ( b || '' ).replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
 			max = Math.max( aNum.length, bNum.length );
 			// natural sorting through split numeric strings and default strings
 			for ( indx = 0; indx < max; indx++ ) {

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

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀    ▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 06-28-2016 (v2.26.5)*/
+/*! tablesorter (FORK) - updated 07-11-2016 (v2.26.6)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -107,7 +107,7 @@
 
 })(jQuery, window, document);
 
-/*! Widget: uitheme - updated 3/26/2015 (v2.21.3) */
+/*! Widget: uitheme - updated 7/11/2016 (v2.26.6) */
 ;(function ($) {
 	'use strict';
 	var ts = $.tablesorter || {};
@@ -165,7 +165,7 @@
 		id: 'uitheme',
 		priority: 10,
 		format: function(table, c, wo) {
-			var i, hdr, icon, time, $header, $icon, $tfoot, $h, oldtheme, oldremove, oldIconRmv, hasOldTheme,
+			var i, tmp, hdr, icon, time, $header, $icon, $tfoot, $h, oldtheme, oldremove, oldIconRmv, hasOldTheme,
 				themesAll = ts.themes,
 				$table = c.$table.add( $( c.namespace + '_extra_table' ) ),
 				$headers = c.$headers.add( $( c.namespace + '_extra_headers' ) ),
@@ -232,10 +232,20 @@
 						.removeClass(hasOldTheme ? [ oldtheme.icons, oldIconRmv ].join(' ') : '')
 						.addClass(themes.icons || '');
 				}
-				if ($table.hasClass('hasFilters')) {
-					$table.children('thead').children('.' + ts.css.filterRow)
-						.removeClass(hasOldTheme ? oldtheme.filterRow || '' : '')
-						.addClass(themes.filterRow || '');
+				// filter widget initializes after uitheme
+				if (c.widgets.indexOf('filter') > -1) {
+					tmp = function() {
+						$table.children('thead').children('.' + ts.css.filterRow)
+							.removeClass(hasOldTheme ? oldtheme.filterRow || '' : '')
+							.addClass(themes.filterRow || '');
+					};
+					if (wo.filter_initialized) {
+						tmp();
+					} else {
+						$table.one('filterInit', function() {
+							tmp();
+						});
+					}
 				}
 			}
 			for (i = 0; i < c.columns; i++) {
@@ -372,7 +382,7 @@
 
 })(jQuery);
 
-/*! Widget: filter - updated 6/28/2015 (v2.26.5) *//*
+/*! Widget: filter - updated 7/11/2016 (v2.26.6) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -1159,12 +1169,13 @@
 			.attr( 'data-lastSearchTime', new Date().getTime() )
 			.unbind( tmp.replace( ts.regex.spaces, ' ' ) )
 			.bind( 'keydown' + namespace, function( event ) {
-				if ( event.which === tskeyCodes.escape && !wo.filter_resetOnEsc ) {
+				if ( event.which === tskeyCodes.escape && !table.config.widgetOptions.filter_resetOnEsc ) {
 					// prevent keypress event
 					return false;
 				}
 			})
 			.bind( 'keyup' + namespace, function( event ) {
+				wo = table.config.widgetOptions; // make sure "wo" isn't cached
 				var column = parseInt( $( this ).attr( 'data-column' ), 10 );
 				$( this ).attr( 'data-lastSearchTime', new Date().getTime() );
 				// emulate what webkit does.... escape clears the filter
@@ -1191,7 +1202,8 @@
 				// don't get cached data, in case data-column changes dynamically
 				var column = parseInt( $( this ).attr( 'data-column' ), 10 );
 				// don't allow 'change' event to process if the input value is the same - fixes #685
-				if ( wo.filter_initialized && ( event.which === tskeyCodes.enter || event.type === 'search' ||
+				if ( table.config.widgetOptions.filter_initialized &&
+					( event.which === tskeyCodes.enter || event.type === 'search' ||
 					( event.type === 'change' ) && this.value !== c.lastSearch[column] ) ||
 					// only "input" event fires in MS Edge when clicking the "x" to clear the search
 					( event.type === 'input' && this.value === '' ) ) {
@@ -1240,7 +1252,7 @@
 				// show/hide filter row as needed
 				c.$table
 					.find( '.' + tscss.filterRow )
-					.triggerHandler( combinedFilters === '' ? 'mouseleave' : 'mouseenter' );
+					.triggerHandler( tsf.hideFiltersCheck( c ) ? 'mouseleave' : 'mouseenter' );
 			}
 			// return if the last search is the same; but filter === false when updating the search
 			// see example-widget-filter.html filter toggle buttons
@@ -1273,26 +1285,34 @@
 				return false;
 			}
 		},
+		hideFiltersCheck: function( c ) {
+			if (typeof c.widgetOptions.filter_hideFilters === 'function') {
+				var val = c.widgetOptions.filter_hideFilters( c );
+				if (typeof val === 'boolean') {
+					return val;
+				}
+			}
+			return ts.getFilters( c.$table ).join( '' ) === '';
+		},
 		hideFilters: function( c, $table ) {
-			var timer,
-				$row = ( $table || c.$table ).find( '.' + tscss.filterRow ).addClass( tscss.filterRowHide );
-			$row
+			var timer;
+			( $table || c.$table )
+				.find( '.' + tscss.filterRow )
+				.addClass( tscss.filterRowHide )
 				.bind( 'mouseenter mouseleave', function( e ) {
 					// save event object - http://bugs.jquery.com/ticket/12140
 					var event = e,
-						$filterRow = $( this );
+						$row = $( this );
 					clearTimeout( timer );
 					timer = setTimeout( function() {
 						if ( /enter|over/.test( event.type ) ) {
-							$filterRow.removeClass( tscss.filterRowHide );
+							$row.removeClass( tscss.filterRowHide );
 						} else {
 							// don't hide if input has focus
 							// $( ':focus' ) needs jQuery 1.6+
-							if ( $( document.activeElement ).closest( 'tr' )[0] !== $filterRow[0] ) {
+							if ( $( document.activeElement ).closest( 'tr' )[0] !== $row[0] ) {
 								// don't hide row if any filter has a value
-								if ( c.lastCombinedFilter === '' ) {
-									$filterRow.addClass( tscss.filterRowHide );
-								}
+								$row.toggleClass( tscss.filterRowHide, tsf.hideFiltersCheck( c ) );
 							}
 						}
 					}, 200 );
@@ -1304,9 +1324,7 @@
 					timer = setTimeout( function() {
 						clearTimeout( timer );
 						// don't hide row if any filter has a value
-						if ( ts.getFilters( c.$table ).join( '' ) === '' ) {
-							$row.toggleClass( tscss.filterRowHide, event.type !== 'focus' );
-						}
+						$row.toggleClass( tscss.filterRowHide, tsf.hideFiltersCheck( c ) && event.type !== 'focus' );
 					}, 200 );
 				});
 		},
@@ -2500,7 +2518,7 @@
 
 })(jQuery, window);
 
-/*! Widget: resizable - updated 6/28/2015 (v2.26.5) */
+/*! Widget: resizable - updated 6/28/2016 (v2.26.5) */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function ($, window) {
 	'use strict';

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

@@ -1,4 +1,4 @@
-/* Widget: columnSelector (responsive table widget) - updated 4/29/2016 (v2.25.9) *//*
+/* Widget: columnSelector (responsive table widget) - updated 7/11/2016 (v2.26.6) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Justin Hallett & Rob Garrison
  */
@@ -348,7 +348,7 @@
 			}
 			// only add resize end if using media queries
 			if ( hasSpans && wo.columnSelector_mediaquery ) {
-				nspace = c.namespace.slice( 1 ) + 'columnselector';
+				nspace = c.namespace + 'columnselector';
 				// Setup window.resizeEnd event
 				$window
 					.off( nspace )
@@ -365,15 +365,18 @@
 		adjustColspans: function(c, wo) {
 			var index, cols, col, span, end, $cell,
 				colSel = c.selector,
-				autoModeOn = colSel.auto,
-				$colspans = $( c.namespace + 'columnselectorHasSpan' ),
-				len = $colspans.length;
-			if ( len ) {
-				for ( index = 0; index < len; index++ ) {
-					$cell = $colspans.eq(index);
-					col = parseInt( $cell.attr('data-column'), 10 ) || $cell[0].cellIndex;
-					span = parseInt( $cell.attr('data-col-span'), 10 );
-					end = col + span;
+				filtered = wo.filter_filteredRow || 'filtered',
+				autoModeOn = wo.columnSelector_mediaquery && colSel.auto,
+				// find all header/footer cells in case a regular column follows a colspan; see #1238
+				$headers = c.$table.children( 'thead, tfoot' ).children().children()
+					.add( $(c.namespace + '_extra_table').children( 'thead, tfoot' ).children().children() ),
+				len = $headers.length;
+			for ( index = 0; index < len; index++ ) {
+				$cell = $headers.eq(index);
+				col = parseInt( $cell.attr('data-column'), 10 ) || $cell[0].cellIndex;
+				span = parseInt( $cell.attr('data-col-span'), 10 ) || 1;
+				end = col + span;
+				if ( span > 1 ) {
 					for ( cols = col; cols < end; cols++ ) {
 						if ( !autoModeOn && colSel.states[ cols ] === false ||
 							autoModeOn && c.$headerIndexed[ cols ] && !c.$headerIndexed[ cols ].is(':visible') ) {
@@ -381,10 +384,12 @@
 						}
 					}
 					if ( span ) {
-						$cell.removeClass( wo.filter_filteredRow || 'filtered' )[0].colSpan = span;
+						$cell.removeClass( filtered )[0].colSpan = span;
 					} else {
-						$cell.addClass( wo.filter_filteredRow || 'filtered' );
+						$cell.addClass( filtered );
 					}
+				} else if ( typeof colSel.states[ col ] !== 'undefined' ) {
+					$cell.toggleClass( filtered, !colSel.states[ col ] );
 				}
 			}
 		},

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

@@ -1,4 +1,4 @@
-/*! Widget: filter, select2 formatter function - updated 5/28/2016 (v2.26.2) *//*
+/*! Widget: filter, select2 formatter function - updated 7/11/2016 (v2.26.6) *//*
  * requires: jQuery 1.7.2+, tableSorter (FORK) 2.16+, filter widget 2.16+
  and select2 v3.4.6+ plugin (this code is NOT compatible with select2 v4+)
  */
@@ -25,28 +25,40 @@
 
 		}, select2Def ),
 		arry, data,
-		c = $cell.closest('table')[0].config,
+		// add class to $cell since it may point to a removed DOM node
+		// after a "refreshWidgets"; see #1237
+		c = $cell.addClass('select2col' + indx).closest('table')[0].config,
 		wo = c.widgetOptions,
 		// Add a hidden input to hold the range values
 		$input = $('<input class="filter" type="hidden">')
 			.appendTo($cell)
 			// hidden filter update namespace trigger by filter widget
 			.bind('change' + c.namespace + 'filter', function(){
-				var val = this.value;
-				val = val.replace(/[/()$^]/g, '').split('|');
-				$cell.find('.select2').select2('val', val);
+				var val = convertRegex(this.value);
+				c.$table.find('.select2col' + indx + ' .select2').select2('val', val);
 				updateSelect2();
 			}),
 		$header = c.$headerIndexed[indx],
 		onlyAvail = $header.hasClass(wo.filter_onlyAvail),
-		$shcell = [],
 		matchPrefix = o.match ? '' : '^',
 		matchSuffix = o.match ? '' : '$',
+		flags = wo.filter_ignoreCase ? 'i' : '',
+
+		convertRegex = function(val) {
+			// value = '/(^x$|^y$)/' => ['x','y']
+			return val
+				.replace(/^\/\(\^?/, '')
+				.replace(/\$\|\^/g, '|')
+				.replace(/\$?\)\/i?$/g, '')
+				// unescape special regex characters
+				.replace(/\\/g, '')
+				.split('|');
+		},
 
 		// this function updates the hidden input and adds the current values to the header cell text
 		updateSelect2 = function() {
 			var arry = false,
-				v = $cell.find('.select2').select2('val') || o.value || '';
+				v = c.$table.find('.select2col' + indx + ' .select2').select2('val') || o.value || '';
 			// convert array to string
 			if ($.isArray(v)) {
 				arry = true;
@@ -60,12 +72,16 @@
 			}
 			$input
 				// add regex, so we filter exact numbers
-				.val( $.isArray(v) && v.length && v.join('') !== '' ? '/(' + matchPrefix + (v || []).join(matchSuffix + '|' + matchPrefix) + matchSuffix + ')/' : '' )
+				.val(
+					$.isArray(v) && v.length && v.join('') !== '' ?
+						'/(' + matchPrefix + (v || []).join(matchSuffix + '|' + matchPrefix) + matchSuffix + ')/' + flags :
+						''
+				)
 				.trigger('search').end()
 				.find('.select2').select2('val', v);
 			// update sticky header cell
-			if ($shcell.length) {
-				$shcell.find('.select2').select2('val', v);
+			if (c.widgetOptions.$sticky) {
+				c.widgetOptions.$sticky.find('.select2col' + indx + ' .select2').select2('val', v);
 			}
 		},
 
@@ -91,12 +107,13 @@
 		// data options are already defined
 		if (!(o.ajax && !$.isEmptyObject(o.ajax)) && !o.data) {
 			updateOptions();
-			if (onlyAvail) {
-				c.$table.bind('filterEnd', function(){
-					updateOptions();
-					$cell.add($shcell).find('.select2').select2(o);
-				});
-			}
+			c.$table.bind('filterEnd', function(){
+				updateOptions();
+				c.$table
+					.find('.select2col' + indx)
+					.add(c.widgetOptions.$sticky && c.widgetOptions.$sticky.find('.select2col' + indx))
+					.find('.select2').select2(o);
+			});
 		}
 
 		// add a select2 hidden input!
@@ -109,10 +126,10 @@
 			});
 
 		// update select2 from filter hidden input, in case of saved filters
-		c.$table.bind('filterFomatterUpdate', function(){
+		c.$table.bind('filterFomatterUpdate', function() {
 			// value = '/(^x$|^y$)/' => 'x,y'
-			var val = c.$table.data('lastSearch')[indx] || '';
-			val = val.replace(/^\/\(\^?/, '').replace(/\$\|\^/g, '|').replace(/\$?\)\/$/g, '').split('|');
+			var val = convertRegex(c.$table.data('lastSearch')[indx] || '');
+			$cell = c.$table.find('.select2col' + indx);
 			$cell.find('.select2').select2('val', val);
 			updateSelect2();
 			ts.filter.formatterUpdated($cell, indx);
@@ -120,25 +137,26 @@
 
 		// has sticky headers?
 		c.$table.bind('stickyHeadersInit', function(){
-			$shcell = c.widgetOptions.$sticky.find('.' + ts.css.filterRow).children().eq(indx).empty();
+			var $shcell = c.widgetOptions.$sticky.find('.select2col' + indx).empty();
 			// add a select2!
 			$('<input class="select2 select2-' + indx + '" type="hidden">')
 				.val(o.value)
 				.appendTo($shcell)
 				.select2(o)
 				.bind('change', function(){
-					$cell.find('.select2').select2('val', $shcell.find('.select2').select2('val') );
+					c.$table.find('.select2col' + indx)
+						.find('.select2')
+						.select2('val', c.widgetOptions.$sticky.find('.select2col' + indx + ' .select2').select2('val') );
 					updateSelect2();
 				});
 			if (o.cellText) {
 				$shcell.prepend('<label>' + o.cellText + '</label>');
 			}
-
 		});
 
 		// on reset
 		c.$table.bind('filterReset', function(){
-			$cell.find('.select2').select2('val', o.value || '');
+			c.$table.find('.select2col' + indx).find('.select2').select2('val', o.value || '');
 			setTimeout(function(){
 				updateSelect2();
 			}, 0);

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

@@ -1,4 +1,4 @@
-/*! Widget: filter - updated 6/28/2015 (v2.26.5) *//*
+/*! Widget: filter - updated 7/11/2016 (v2.26.6) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -785,12 +785,13 @@
 			.attr( 'data-lastSearchTime', new Date().getTime() )
 			.unbind( tmp.replace( ts.regex.spaces, ' ' ) )
 			.bind( 'keydown' + namespace, function( event ) {
-				if ( event.which === tskeyCodes.escape && !wo.filter_resetOnEsc ) {
+				if ( event.which === tskeyCodes.escape && !table.config.widgetOptions.filter_resetOnEsc ) {
 					// prevent keypress event
 					return false;
 				}
 			})
 			.bind( 'keyup' + namespace, function( event ) {
+				wo = table.config.widgetOptions; // make sure "wo" isn't cached
 				var column = parseInt( $( this ).attr( 'data-column' ), 10 );
 				$( this ).attr( 'data-lastSearchTime', new Date().getTime() );
 				// emulate what webkit does.... escape clears the filter
@@ -817,7 +818,8 @@
 				// don't get cached data, in case data-column changes dynamically
 				var column = parseInt( $( this ).attr( 'data-column' ), 10 );
 				// don't allow 'change' event to process if the input value is the same - fixes #685
-				if ( wo.filter_initialized && ( event.which === tskeyCodes.enter || event.type === 'search' ||
+				if ( table.config.widgetOptions.filter_initialized &&
+					( event.which === tskeyCodes.enter || event.type === 'search' ||
 					( event.type === 'change' ) && this.value !== c.lastSearch[column] ) ||
 					// only "input" event fires in MS Edge when clicking the "x" to clear the search
 					( event.type === 'input' && this.value === '' ) ) {
@@ -866,7 +868,7 @@
 				// show/hide filter row as needed
 				c.$table
 					.find( '.' + tscss.filterRow )
-					.triggerHandler( combinedFilters === '' ? 'mouseleave' : 'mouseenter' );
+					.triggerHandler( tsf.hideFiltersCheck( c ) ? 'mouseleave' : 'mouseenter' );
 			}
 			// return if the last search is the same; but filter === false when updating the search
 			// see example-widget-filter.html filter toggle buttons
@@ -899,26 +901,34 @@
 				return false;
 			}
 		},
+		hideFiltersCheck: function( c ) {
+			if (typeof c.widgetOptions.filter_hideFilters === 'function') {
+				var val = c.widgetOptions.filter_hideFilters( c );
+				if (typeof val === 'boolean') {
+					return val;
+				}
+			}
+			return ts.getFilters( c.$table ).join( '' ) === '';
+		},
 		hideFilters: function( c, $table ) {
-			var timer,
-				$row = ( $table || c.$table ).find( '.' + tscss.filterRow ).addClass( tscss.filterRowHide );
-			$row
+			var timer;
+			( $table || c.$table )
+				.find( '.' + tscss.filterRow )
+				.addClass( tscss.filterRowHide )
 				.bind( 'mouseenter mouseleave', function( e ) {
 					// save event object - http://bugs.jquery.com/ticket/12140
 					var event = e,
-						$filterRow = $( this );
+						$row = $( this );
 					clearTimeout( timer );
 					timer = setTimeout( function() {
 						if ( /enter|over/.test( event.type ) ) {
-							$filterRow.removeClass( tscss.filterRowHide );
+							$row.removeClass( tscss.filterRowHide );
 						} else {
 							// don't hide if input has focus
 							// $( ':focus' ) needs jQuery 1.6+
-							if ( $( document.activeElement ).closest( 'tr' )[0] !== $filterRow[0] ) {
+							if ( $( document.activeElement ).closest( 'tr' )[0] !== $row[0] ) {
 								// don't hide row if any filter has a value
-								if ( c.lastCombinedFilter === '' ) {
-									$filterRow.addClass( tscss.filterRowHide );
-								}
+								$row.toggleClass( tscss.filterRowHide, tsf.hideFiltersCheck( c ) );
 							}
 						}
 					}, 200 );
@@ -930,9 +940,7 @@
 					timer = setTimeout( function() {
 						clearTimeout( timer );
 						// don't hide row if any filter has a value
-						if ( ts.getFilters( c.$table ).join( '' ) === '' ) {
-							$row.toggleClass( tscss.filterRowHide, event.type !== 'focus' );
-						}
+						$row.toggleClass( tscss.filterRowHide, tsf.hideFiltersCheck( c ) && event.type !== 'focus' );
 					}, 200 );
 				});
 		},

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

@@ -1,4 +1,4 @@
-/*! Widget: grouping - updated 6/28/2015 (v2.26.5) *//*
+/*! Widget: grouping - updated 7/11/2016 (v2.26.6) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -151,12 +151,10 @@
 						}
 					}
 				}
-
 				// save collapsed groups
 				if ( wo.group_saveGroups &&
 					!$.isEmptyObject( wo.group_collapsedGroups ) &&
 					wo.group_collapsedGroups[ wo.group_collapsedGroup ].length ) {
-
 					name = $row.find( '.group-name' ).text().toLowerCase() + $row.attr( 'data-group-index' );
 					isHidden = $.inArray( name, wo.group_collapsedGroups[ wo.group_collapsedGroup ] ) > -1;
 					$row.toggleClass( 'collapsed', isHidden );
@@ -172,7 +170,7 @@
 			var name = ( data.currentGroup || '' ).replace(/</g, '&lt;').replace(/>/g, '&gt;');
 			return '<tr class="group-header ' + c.selectorRemove.slice(1) +
 				'" unselectable="on" ' + ( c.tabIndex ? 'tabindex="0" ' : '' ) + 'data-group-index="' +
-				( data.groupIndex++ ) + '">' +
+				data.groupIndex + '">' +
 				'<td colspan="' + c.columns + '">' +
 					( wo.group_collapsible ? '<i/>' : '' ) +
 					'<span class="group-name">' + name + '</span>' +
@@ -183,8 +181,8 @@
 			// save current grouping
 			var saveName, direction,
 				savedGroup = false;
-			if (wo.group_collapsible && wo.group_saveGroups && ts.storage) {
-				wo.group_collapsedGroups = ts.storage( c.table, 'tablesorter-groups' ) || {};
+			if (wo.group_collapsible && wo.group_saveGroups) {
+				wo.group_collapsedGroups = ts.storage && ts.storage( c.table, 'tablesorter-groups' ) || {};
 				// include direction when saving groups (reversed numbers shows different range values)
 				direction = 'dir' + c.sortList[0][1];
 				// combine column, sort direction & grouping as save key
@@ -234,9 +232,10 @@
 				}
 				data.$row.before( tsg.groupHeaderHTML( c, wo, data ) );
 				if ( wo.group_saveGroups && !data.savedGroup && wo.group_collapsed && wo.group_collapsible ) {
-					// all groups start collapsed
-					wo.group_collapsedGroups[ wo.group_collapsedGroup ].push( data.currentGroup );
+					// all groups start collapsed; data.groupIndex is 1 more than the expected index.
+					wo.group_collapsedGroups[ wo.group_collapsedGroup ].push( data.currentGroup + data.groupIndex );
 				}
+				data.groupIndex++;
 			}
 		},
 

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

@@ -1,4 +1,4 @@
-/*! Widget: Pager - updated 6/28/2015 (v2.26.5) */
+/*! Widget: Pager - updated 7/11/2016 (v2.26.6) */
 /* Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -1085,7 +1085,7 @@
 					p.filteredRows = typeof tmp.filtered !== 'undefined' ? tmp.filtered :
 						( c.debug ? console.error('Pager: no initial filtered page set!') || 0 : 0 );
 					tsp.updatePageDisplay( c, false );
-				} else {
+				} else if (p.initialized) {
 					tsp.getAjax( c );
 				}
 			} else if ( !p.ajax ) {
@@ -1115,7 +1115,7 @@
 		parsePageSize: function( c, size, mode ) {
 			var p = c.pager,
 				s = parseInt( size, 10 ) || p.size || c.widgetOptions.pager_size || 10;
-			return /all/i.test( size ) || s === p.totalRows ?
+			return p.initialized && (/all/i.test( size ) || s === p.totalRows) ?
 				// "get" to set `p.size` or "set" to set `p.$size.val()`
 				'all' : ( mode === 'get' ? s : p.size );
 		},

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

@@ -1,4 +1,4 @@
-/*! Widget: resizable - updated 6/28/2015 (v2.26.5) */
+/*! Widget: resizable - updated 6/28/2016 (v2.26.5) */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function ($, window) {
 	'use strict';

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

@@ -1,4 +1,4 @@
-/*! Widget: scroller - updated 6/15/2016 (v2.26.3) *//*
+/*! Widget: scroller - updated 7/11/2016 (v2.26.6) *//*
 	Copyright (C) 2011 T. Connell & Associates, Inc.
 
 	Dual-licensed under the MIT and GPL licenses
@@ -370,6 +370,8 @@
 				$tableWrap = $table.parent(),
 				$hdr = wo.scroller_$header,
 				$foot = wo.scroller_$footer,
+				$win = $(window),
+				position = [ $win.scrollLeft(), $win.scrollTop() ],
 				id = c.namespace.slice( 1 ) + 'tsscroller',
 				// Hide other scrollers so we can resize
 				$div = $( 'div.' + tscss.scrollerWrap + '[id!="' + id + '"]' )
@@ -459,6 +461,8 @@
 				.find( '.' + tscss.scrollerFixed )
 				.find( '.' + tscss.scrollerTable )
 				.scrollTop( wo.scroller_saved[1] );
+			$win.scrollLeft( position[0] );
+			$win.scrollTop( position[1] );
 
 			// update resizable widget handles
 			setTimeout( function() {

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

@@ -1,4 +1,4 @@
-/*! Widget: uitheme - updated 3/26/2015 (v2.21.3) */
+/*! Widget: uitheme - updated 7/11/2016 (v2.26.6) */
 ;(function ($) {
 	'use strict';
 	var ts = $.tablesorter || {};
@@ -56,7 +56,7 @@
 		id: 'uitheme',
 		priority: 10,
 		format: function(table, c, wo) {
-			var i, hdr, icon, time, $header, $icon, $tfoot, $h, oldtheme, oldremove, oldIconRmv, hasOldTheme,
+			var i, tmp, hdr, icon, time, $header, $icon, $tfoot, $h, oldtheme, oldremove, oldIconRmv, hasOldTheme,
 				themesAll = ts.themes,
 				$table = c.$table.add( $( c.namespace + '_extra_table' ) ),
 				$headers = c.$headers.add( $( c.namespace + '_extra_headers' ) ),
@@ -123,10 +123,20 @@
 						.removeClass(hasOldTheme ? [ oldtheme.icons, oldIconRmv ].join(' ') : '')
 						.addClass(themes.icons || '');
 				}
-				if ($table.hasClass('hasFilters')) {
-					$table.children('thead').children('.' + ts.css.filterRow)
-						.removeClass(hasOldTheme ? oldtheme.filterRow || '' : '')
-						.addClass(themes.filterRow || '');
+				// filter widget initializes after uitheme
+				if (c.widgets.indexOf('filter') > -1) {
+					tmp = function() {
+						$table.children('thead').children('.' + ts.css.filterRow)
+							.removeClass(hasOldTheme ? oldtheme.filterRow || '' : '')
+							.addClass(themes.filterRow || '');
+					};
+					if (wo.filter_initialized) {
+						tmp();
+					} else {
+						$table.one('filterInit', function() {
+							tmp();
+						});
+					}
 				}
 			}
 			for (i = 0; i < c.columns; i++) {

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

@@ -1,4 +1,4 @@
-/* Widget: view (beta) - updated 10/31/2015 (v2.24.0) */
+/* Widget: view (beta) - updated 7/11/2016 (v2.26.6) */
 /* By Justin F. Hallett (https://github.com/TheSin-)
  * Requires tablesorter v2.8+ and jQuery 1.7+
  */
@@ -100,7 +100,10 @@
 						var content = $(v).html();
 						// Add 2 spans, one is dropped when using .html()
 						var span = $('<span />').append($('<span/>', attrs).append(content));
-						tmpl = tmpl.replace(reg, span.html());
+						tmpl = tmpl.replace(new RegExp(reg, 'g'), span.html());
+
+						reg = '{col' + k + ':raw}';
+						tmpl = tmpl.replace(new RegExp(reg, 'g'), $(v).text());
 					});
 
 					var $tmpl = $(tmpl);
@@ -115,6 +118,7 @@
 				});
 
 				$(wo.view_container).append($container);
+				c.$table.triggerHandler('viewComplete');
 			},
 
 			removeView: function(c, wo) {
@@ -151,7 +155,6 @@
 				c.$table.on('tablesorter-ready', function() {
 					view.buildToolBar(c, wo);
 					view.buildView(c, wo);
-					c.$table.triggerHandler('viewComplete');
 				});
 			},
 

data/vendor/assets/stylesheets/jquery-tablesorter/theme.bootstrap.css

@@ -23,10 +23,17 @@
 	cursor: default;
 }
 
+.tablesorter-bootstrap .tablesorter-header.sorter-false i.tablesorter-icon {
+	display: none;
+}
+
 .tablesorter-bootstrap .tablesorter-header-inner {
 	position: relative;
 	padding: 4px 18px 4px 4px;
 }
+.tablesorter-bootstrap .sorter-false .tablesorter-header-inner {
+	padding: 4px;
+}
 
 /* bootstrap uses <i> for icons */
 .tablesorter-bootstrap .tablesorter-header i.tablesorter-icon {

data/vendor/assets/stylesheets/jquery-tablesorter/theme.bootstrap_2.css

@@ -34,11 +34,17 @@
 .tablesorter-bootstrap .sorter-false {
 	cursor: default;
 }
+.tablesorter-bootstrap .tablesorter-header.sorter-false i.tablesorter-icon {
+	display: none;
+}
 
 .tablesorter-bootstrap .tablesorter-header-inner {
 	position: relative;
 	padding: 4px 18px 4px 4px;
 }
+.tablesorter-bootstrap .sorter-false .tablesorter-header-inner {
+	padding: 4px;
+}
 
 /* bootstrap uses <i> for icons */
 .tablesorter-bootstrap .tablesorter-header i.tablesorter-icon {

data/vendor/assets/stylesheets/jquery-tablesorter/theme.dropbox.css

@@ -79,10 +79,8 @@
 	cursor: default;
 }
 
-.tablesorter-dropbox thead .sorter-false i.tablesorter-icon,
-.tablesorter-dropbox thead .sorter-false:hover i.tablesorter-icon {
-	background-image: none;
-	padding: 4px;
+.tablesorter-dropbox thead .sorter-false i.tablesorter-icon {
+	display: none;
 }
 
 /* tbody */

data/vendor/assets/stylesheets/jquery-tablesorter/theme.grey.css

@@ -85,8 +85,7 @@
 	cursor: default;
 }
 .tablesorter-grey thead .sorter-false i.tablesorter-icon {
-	background-image: none;
-	padding: 4px;
+	display: none;
 }
 
 /* tfoot */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.21.3
+  version: 1.21.4
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties