jquery-tablesorter 1.18.3 → 1.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a142ba049c8283ad5701ebc22af25c6f2a0a186e
-  data.tar.gz: 01d9fbb2e17cd989c67376e6f71aa809ed3c3639
+  metadata.gz: 7f25b2d1c32020eb01d61f3b5b36078ea6c6ac85
+  data.tar.gz: 3d8e1b92751a59e9f79aaa7989bd0303fec33118
 SHA512:
-  metadata.gz: f0dafc07d7437a3af57ab0542226dd55d5cd0f1cbb4ad86290d1326644337a091b597cf03f98b20ab7cf8c3fbb8327024f16c4dbe59f226b1ea3a527e69337cd
-  data.tar.gz: 0c23865e29959b6c0ea505cb026ed5635d39e1b760b902bd25a2f0dc29c6553875a1b07899349353afc907d0d356fd716119cbb0d4e3799643a0bf4a78469f4c
+  metadata.gz: 2abcb7450f22141441bb95ca5044426d0041d3430e2fb96a5fd6421ee2fc5ce0e45798d253366c7a4641a0e3735c94ba28b0bbe45a55ff0978ae323864fc0198
+  data.tar.gz: c7ec726ac20494eceb26014dcfb791b47c256ee8f6ffe86a6765ccae79c071c6483ea4a9832edcd95bd9a1a607e911612de52845d5d0382e2b15e69a9a94c6bc

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.23.3 (9/1/2015), [documentation]
+Current tablesorter version: 2.23.4 (9/23/2015), [documentation]
 
 Any issue associated with the js/css files, please report to [Mottie's fork].
 

data/lib/jquery-tablesorter/version.rb

@@ -1,3 +1,3 @@
 module JqueryTablesorter
-  VERSION = '1.18.3'
+  VERSION = '1.18.4'
 end

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

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀   ▀▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 09-01-2015 (v2.23.3)*/
+/*! tablesorter (FORK) - updated 09-23-2015 (v2.23.4)*/
 /* 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.23.3 *//*
+/*! TableSorter (FORK) v2.23.4 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -43,7 +43,7 @@
 
 			var ts = this;
 
-			ts.version = '2.23.3';
+			ts.version = '2.23.4';
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -1606,7 +1606,7 @@
 
 			// *** sort functions ***
 			// regex used in natural sort
-			ts.regex.chunk = /(^([+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi; // chunk/tokenize numbers & letters
+			ts.regex.chunk = /(^([+\-]?(?:\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi; // chunk/tokenize numbers & letters
 			ts.regex.chunks = /(^\\0|\\0$)/; // replace chunks @ ends
 			ts.regex.hex = /^0x[0-9a-f]+$/i; // hex
 
@@ -1810,13 +1810,12 @@
 
 			ts.applyWidgetOptions = function( table, c ){
 				var indx, widget,
-					len = c.widgets.length,
-					wo = c.widgetOptions;
+					len = c.widgets.length;
 				if (len) {
 					for (indx = 0; indx < len; indx++) {
 						widget = ts.getWidgetById( c.widgets[indx] );
 						if ( widget && 'options' in widget ) {
-							wo = table.config.widgetOptions = $.extend( true, {}, widget.options, wo );
+							c.widgetOptions = $.extend( true, {}, widget.options, c.widgetOptions );
 						}
 					}
 				}
@@ -1826,7 +1825,6 @@
 				table = $(table)[0]; // in case this is called externally
 				var indx, len, names, widget, name, applied,
 					c = table.config,
-					wo = c.widgetOptions,
 					tableClass = ' ' + c.table.className + ' ',
 					widgets = [],
 					time, time2, w, wd;
@@ -1884,14 +1882,14 @@
 								c.widgetInit[ name ] = true;
 								if (table.hasInitialized) {
 									// don't reapply widget options on tablesorter init
-									ts.applyWidgetOptions( table, c );
+									ts.applyWidgetOptions( table, table.config );
 								}
 								if ( 'init' in widget ) {
 									applied = true;
 									if (c.debug) {
 										console[ console.group ? 'group' : 'log' ]( 'Initializing ' + name + ' widget' );
 									}
-									widget.init(table, widget, c, wo);
+									widget.init(table, widget, table.config, table.config.widgetOptions);
 								}
 							}
 							if ( !init && 'format' in widget ) {
@@ -1899,7 +1897,7 @@
 								if (c.debug) {
 									console[ console.group ? 'group' : 'log' ]( 'Updating ' + name + ' widget' );
 								}
-								widget.format(table, c, wo, false);
+								widget.format(table, table.config, table.config.widgetOptions, false);
 							}
 							if (c.debug) {
 								if (applied) {
@@ -2109,7 +2107,7 @@
 	});
 
 	// set up debug logs
-	if ( !( console && console.log ) ) {
+	if ( !( window.console && window.console.log ) ) {
 		ts.logs = [];
 		/*jshint -W020 */
 		console = {};
@@ -2718,7 +2716,7 @@
 
 })(jQuery);
 
-/*! Widget: filter - updated 9/1/2015 (v2.23.3) *//*
+/*! Widget: filter - updated 9/23/2015 (v2.23.4) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -2741,6 +2739,7 @@
 		options : {
 			filter_childRows     : false, // if true, filter includes child row content in the search
 			filter_childByColumn : false, // ( filter_childRows must be true ) if true = search child rows by column; false = search all child row text grouped
+			filter_childWithSibs : true,  // if true, include matching child row siblings
 			filter_columnFilters : true,  // if true, a filter will be added to the top of each table column
 			filter_columnAnyMatch: true,  // if true, allows using '#:{query}' in AnyMatch searches ( column:query )
 			filter_cellFilter    : '',    // css class name added to the filter cell ( string or array )
@@ -3077,7 +3076,7 @@
 			c.$table.addClass( 'hasFilters' );
 
 			// define timers so using clearTimeout won't cause an undefined error
-			wo.searchTimer = null;
+			wo.filter_searchTimer = null;
 			wo.filter_initTimer = null;
 			wo.filter_formatterCount = 0;
 			wo.filter_formatterInit = [];
@@ -3210,7 +3209,7 @@
 								.find( 'select.' + tscss.filter + '[data-column="' + column + '"]' )
 								.append( options );
 							txt = wo.filter_selectSource;
-							fxn = $.isFunction( txt ) ? true : ts.getColumnData( table, txt, column );
+							fxn = typeof txt === 'function' ? true : ts.getColumnData( table, txt, column );
 							if ( fxn ) {
 								// updating so the extra options are appended
 								tsf.buildSelect( c.table, column, '', true, $header.hasClass( wo.filter_onlyAvail ) );
@@ -3229,7 +3228,7 @@
 			}
 
 			if ( wo.filter_hideFilters ) {
-				tsf.hideFilters( table, c );
+				tsf.hideFilters( c );
 			}
 
 			// show processing icon
@@ -3356,7 +3355,7 @@
 			return parsed ? c.parsers[column].format( filter, c.table, [], column ) : filter;
 		},
 		buildRow: function( table, c, wo ) {
-			var col, column, $header, buildSelect, disabled, name, ffxn, tmp,
+			var col, column, $header, makeSelect, disabled, name, ffxn, tmp,
 				// c.columns defined in computeThIndexes()
 				cellFilter = wo.filter_cellFilter,
 				columns = c.columns,
@@ -3380,14 +3379,14 @@
 				// assuming last cell of a column is the main column
 				$header = c.$headerIndexed[ column ];
 				ffxn = ts.getColumnData( table, wo.filter_functions, column );
-				buildSelect = ( wo.filter_functions && ffxn && typeof ffxn !== 'function' ) ||
+				makeSelect = ( wo.filter_functions && ffxn && typeof ffxn !== 'function' ) ||
 					$header.hasClass( 'filter-select' );
 				// get data from jQuery data, metadata, headers option or header class name
 				col = ts.getColumnData( table, c.headers, column );
 				disabled = ts.getData( $header[0], col, 'filter' ) === 'false' ||
 					ts.getData( $header[0], col, 'parser' ) === 'false';
 
-				if ( buildSelect ) {
+				if ( makeSelect ) {
 					buildFilter = $( '<select>' ).appendTo( c.$filters.eq( column ) );
 				} else {
 					ffxn = ts.getColumnData( table, wo.filter_formatter, column );
@@ -3489,10 +3488,10 @@
 		},
 		searching: function( table, filter, skipFirst ) {
 			var wo = table.config.widgetOptions;
-			clearTimeout( wo.searchTimer );
+			clearTimeout( wo.filter_searchTimer );
 			if ( typeof filter === 'undefined' || filter === true ) {
 				// delay filtering
-				wo.searchTimer = setTimeout( function() {
+				wo.filter_searchTimer = setTimeout( function() {
 					tsf.checkFilters( table, filter, skipFirst );
 				}, wo.filter_liveSearch ? wo.filter_searchDelay : 10 );
 			} else {
@@ -3550,7 +3549,7 @@
 				return false;
 			}
 		},
-		hideFilters: function( table, c ) {
+		hideFilters: function( c ) {
 			var timer;
 			c.$table
 				.find( '.' + tscss.filterRow )
@@ -3627,7 +3626,7 @@
 				targets = wo.filter_initialized || !$input.filter( wo.filter_anyColumnSelector ).length,
 				columns = [],
 				val = $.trim( tsf.getLatestSearch( $input ).attr( 'data-column' ) || '' );
-			if ( !/[,-]/.test(val) && val.length === 1 ) {
+			if ( /^[0-9]+$/.test(val)) {
 				return parseInt( val, 10 );
 			}
 			// process column range
@@ -3841,7 +3840,7 @@
 				!table.config.widgetOptions.filter_initialized ) {
 				return;
 			}
-			var len, norm_rows, rowData, $rows, rowIndex, tbodyIndex, $tbody, columnIndex,
+			var len, norm_rows, rowData, $rows, $row, rowIndex, tbodyIndex, $tbody, columnIndex,
 				isChild, childRow, lastSearch, showRow, time, val, indx,
 				notFiltered, searchFiltered, query, injected, res, id, txt,
 				storedFilters = $.extend( [], filters ),
@@ -4029,24 +4028,37 @@
 								'';
 						}
 
-						showRow = tsf.processRow( c, data, vars );
+						showRow = false;
+						val = tsf.processRow( c, data, vars );
 						childRow = rowData.$row.filter( ':gt( 0 )' );
-
 						if ( wo.filter_childRows && childRow.length ) {
+							if ( !wo.filter_childWithSibs ) {
+								// hide all child rows
+								childRow.addClass( wo.filter_filteredRow );
+							}
 							if ( wo.filter_childByColumn ) {
 								// cycle through each child row
 								for ( indx = 0; indx < childRow.length; indx++ ) {
 									data.$row = childRow.eq( indx );
 									data.cacheArray = rowData.child[ indx ];
 									data.rawArray = data.cacheArray;
+									val = tsf.processRow( c, data, vars );
 									// use OR comparison on child rows
-									showRow = showRow || tsf.processRow( c, data, vars );
+									showRow = showRow || val;
+									if ( !wo.filter_childWithSibs && val ) {
+										childRow.eq( indx ).removeClass( wo.filter_filteredRow );
+									}
 								}
 							}
-							childRow.toggleClass( wo.filter_filteredRow, !showRow );
+						} else {
+							showRow = val;
 						}
-
-						rowData.$row
+						$row = rowData.$row;
+						// if only showing resulting child row, only include parent
+						if ( !wo.filter_childWithSibs ) {
+							$row = $row.eq( 0 );
+						}
+						$row
 							.toggleClass( wo.filter_filteredRow, !showRow )[0]
 							.display = showRow ? '' : 'none';
 					}
@@ -4074,14 +4086,12 @@
 		},
 		getOptionSource: function( table, column, onlyAvail ) {
 			table = $( table )[0];
-			var cts, txt, indx, len,
-				c = table.config,
+			var c = table.config,
 				wo = c.widgetOptions,
-				parsed = [],
 				arry = false,
 				source = wo.filter_selectSource,
 				last = c.$table.data( 'lastSearch' ) || [],
-				fxn = $.isFunction( source ) ? true : ts.getColumnData( table, source, column );
+				fxn = typeof source === 'function' ? true : ts.getColumnData( table, source, column );
 
 			if ( onlyAvail && last[column] !== '' ) {
 				onlyAvail = false;
@@ -4100,11 +4110,25 @@
 				// custom select source function for a SPECIFIC COLUMN
 				arry = fxn( table, column, onlyAvail );
 			}
+
 			if ( arry === false ) {
 				// fall back to original method
 				arry = tsf.getOptions( table, column, onlyAvail );
 			}
 
+			return tsf.processOptions( table, column, arry );
+
+		},
+		processOptions: function( table, column, arry ) {
+			if ( !$.isArray( arry ) ) {
+				return false;
+			}
+			table = $( table )[0];
+			var cts, txt, indx, len,
+				c = table.config,
+				validColumn = typeof column !== 'undefined' && column !== null && column >= 0 && column < c.columns,
+				parsed = [];
+
 			// get unique elements and sort the list
 			// if $.tablesorter.sortText exists ( not in the original tablesorter ),
 			// then natural sort the list otherwise use a basic sort
@@ -4112,7 +4136,7 @@
 				return $.inArray( value, arry ) === indx;
 			});
 
-			if ( c.$headerIndexed[ column ].hasClass( 'filter-select-nosort' ) ) {
+			if ( validColumn && c.$headerIndexed[ column ].hasClass( 'filter-select-nosort' ) ) {
 				// unsorted select options
 				return arry;
 			} else {
@@ -4125,7 +4149,8 @@
 					parsed.push({
 						t : txt,
 						// check parser length - fixes #934
-						p : c.parsers && c.parsers.length && c.parsers[ column ].format( txt, table, [], column ) || txt
+						p : validColumn && c.parsers && c.parsers.length &&
+							c.parsers[ column ].format( txt, table, [], column ) || txt
 					});
 				}
 
@@ -4135,10 +4160,10 @@
 					// sortNatural breaks if you don't pass it strings
 					var x = a.p.toString(),
 						y = b.p.toString();
-					if ( $.isFunction( cts ) ) {
+					if ( validColumn && typeof cts === 'function' ) {
 						// custom OVERALL text sorter
 						return cts( x, y, true, column, table );
-					} else if ( typeof cts === 'object' && cts.hasOwnProperty( column ) ) {
+					} else if ( validColumn && typeof cts === 'object' && cts.hasOwnProperty( column ) ) {
 						// custom text sorter for a SPECIFIC COLUMN
 						return cts[column]( x, y, true, column, table );
 					} else if ( ts.sortNatural ) {
@@ -4196,6 +4221,7 @@
 			if ( !table.config.cache || $.isEmptyObject( table.config.cache ) ) {
 				return;
 			}
+
 			var indx, val, txt, t, $filters, $filter,
 				c = table.config,
 				wo = c.widgetOptions,
@@ -4211,6 +4237,7 @@
 					.find( 'thead' )
 					.find( 'select.' + tscss.filter + '[data-column="' + column + '"]' )
 					.val();
+
 			// nothing included in arry ( external source ), so get the options from
 			// filter_selectSource or column data
 			if ( typeof arry === 'undefined' || arry === '' ) {

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

@@ -1,4 +1,4 @@
-/*! TableSorter (FORK) v2.23.3 *//*
+/*! TableSorter (FORK) v2.23.4 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -25,7 +25,7 @@
 
 			var ts = this;
 
-			ts.version = '2.23.3';
+			ts.version = '2.23.4';
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -1588,7 +1588,7 @@
 
 			// *** sort functions ***
 			// regex used in natural sort
-			ts.regex.chunk = /(^([+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi; // chunk/tokenize numbers & letters
+			ts.regex.chunk = /(^([+\-]?(?:\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi; // chunk/tokenize numbers & letters
 			ts.regex.chunks = /(^\\0|\\0$)/; // replace chunks @ ends
 			ts.regex.hex = /^0x[0-9a-f]+$/i; // hex
 
@@ -1792,13 +1792,12 @@
 
 			ts.applyWidgetOptions = function( table, c ){
 				var indx, widget,
-					len = c.widgets.length,
-					wo = c.widgetOptions;
+					len = c.widgets.length;
 				if (len) {
 					for (indx = 0; indx < len; indx++) {
 						widget = ts.getWidgetById( c.widgets[indx] );
 						if ( widget && 'options' in widget ) {
-							wo = table.config.widgetOptions = $.extend( true, {}, widget.options, wo );
+							c.widgetOptions = $.extend( true, {}, widget.options, c.widgetOptions );
 						}
 					}
 				}
@@ -1808,7 +1807,6 @@
 				table = $(table)[0]; // in case this is called externally
 				var indx, len, names, widget, name, applied,
 					c = table.config,
-					wo = c.widgetOptions,
 					tableClass = ' ' + c.table.className + ' ',
 					widgets = [],
 					time, time2, w, wd;
@@ -1866,14 +1864,14 @@
 								c.widgetInit[ name ] = true;
 								if (table.hasInitialized) {
 									// don't reapply widget options on tablesorter init
-									ts.applyWidgetOptions( table, c );
+									ts.applyWidgetOptions( table, table.config );
 								}
 								if ( 'init' in widget ) {
 									applied = true;
 									if (c.debug) {
 										console[ console.group ? 'group' : 'log' ]( 'Initializing ' + name + ' widget' );
 									}
-									widget.init(table, widget, c, wo);
+									widget.init(table, widget, table.config, table.config.widgetOptions);
 								}
 							}
 							if ( !init && 'format' in widget ) {
@@ -1881,7 +1879,7 @@
 								if (c.debug) {
 									console[ console.group ? 'group' : 'log' ]( 'Updating ' + name + ' widget' );
 								}
-								widget.format(table, c, wo, false);
+								widget.format(table, table.config, table.config.widgetOptions, false);
 							}
 							if (c.debug) {
 								if (applied) {
@@ -2091,7 +2089,7 @@
 	});
 
 	// set up debug logs
-	if ( !( console && console.log ) ) {
+	if ( !( window.console && window.console.log ) ) {
 		ts.logs = [];
 		/*jshint -W020 */
 		console = {};

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

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀   ▀▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 09-01-2015 (v2.23.3)*/
+/*! tablesorter (FORK) - updated 09-23-2015 (v2.23.4)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -372,7 +372,7 @@
 
 })(jQuery);
 
-/*! Widget: filter - updated 9/1/2015 (v2.23.3) *//*
+/*! Widget: filter - updated 9/23/2015 (v2.23.4) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -395,6 +395,7 @@
 		options : {
 			filter_childRows     : false, // if true, filter includes child row content in the search
 			filter_childByColumn : false, // ( filter_childRows must be true ) if true = search child rows by column; false = search all child row text grouped
+			filter_childWithSibs : true,  // if true, include matching child row siblings
 			filter_columnFilters : true,  // if true, a filter will be added to the top of each table column
 			filter_columnAnyMatch: true,  // if true, allows using '#:{query}' in AnyMatch searches ( column:query )
 			filter_cellFilter    : '',    // css class name added to the filter cell ( string or array )
@@ -731,7 +732,7 @@
 			c.$table.addClass( 'hasFilters' );
 
 			// define timers so using clearTimeout won't cause an undefined error
-			wo.searchTimer = null;
+			wo.filter_searchTimer = null;
 			wo.filter_initTimer = null;
 			wo.filter_formatterCount = 0;
 			wo.filter_formatterInit = [];
@@ -864,7 +865,7 @@
 								.find( 'select.' + tscss.filter + '[data-column="' + column + '"]' )
 								.append( options );
 							txt = wo.filter_selectSource;
-							fxn = $.isFunction( txt ) ? true : ts.getColumnData( table, txt, column );
+							fxn = typeof txt === 'function' ? true : ts.getColumnData( table, txt, column );
 							if ( fxn ) {
 								// updating so the extra options are appended
 								tsf.buildSelect( c.table, column, '', true, $header.hasClass( wo.filter_onlyAvail ) );
@@ -883,7 +884,7 @@
 			}
 
 			if ( wo.filter_hideFilters ) {
-				tsf.hideFilters( table, c );
+				tsf.hideFilters( c );
 			}
 
 			// show processing icon
@@ -1010,7 +1011,7 @@
 			return parsed ? c.parsers[column].format( filter, c.table, [], column ) : filter;
 		},
 		buildRow: function( table, c, wo ) {
-			var col, column, $header, buildSelect, disabled, name, ffxn, tmp,
+			var col, column, $header, makeSelect, disabled, name, ffxn, tmp,
 				// c.columns defined in computeThIndexes()
 				cellFilter = wo.filter_cellFilter,
 				columns = c.columns,
@@ -1034,14 +1035,14 @@
 				// assuming last cell of a column is the main column
 				$header = c.$headerIndexed[ column ];
 				ffxn = ts.getColumnData( table, wo.filter_functions, column );
-				buildSelect = ( wo.filter_functions && ffxn && typeof ffxn !== 'function' ) ||
+				makeSelect = ( wo.filter_functions && ffxn && typeof ffxn !== 'function' ) ||
 					$header.hasClass( 'filter-select' );
 				// get data from jQuery data, metadata, headers option or header class name
 				col = ts.getColumnData( table, c.headers, column );
 				disabled = ts.getData( $header[0], col, 'filter' ) === 'false' ||
 					ts.getData( $header[0], col, 'parser' ) === 'false';
 
-				if ( buildSelect ) {
+				if ( makeSelect ) {
 					buildFilter = $( '<select>' ).appendTo( c.$filters.eq( column ) );
 				} else {
 					ffxn = ts.getColumnData( table, wo.filter_formatter, column );
@@ -1143,10 +1144,10 @@
 		},
 		searching: function( table, filter, skipFirst ) {
 			var wo = table.config.widgetOptions;
-			clearTimeout( wo.searchTimer );
+			clearTimeout( wo.filter_searchTimer );
 			if ( typeof filter === 'undefined' || filter === true ) {
 				// delay filtering
-				wo.searchTimer = setTimeout( function() {
+				wo.filter_searchTimer = setTimeout( function() {
 					tsf.checkFilters( table, filter, skipFirst );
 				}, wo.filter_liveSearch ? wo.filter_searchDelay : 10 );
 			} else {
@@ -1204,7 +1205,7 @@
 				return false;
 			}
 		},
-		hideFilters: function( table, c ) {
+		hideFilters: function( c ) {
 			var timer;
 			c.$table
 				.find( '.' + tscss.filterRow )
@@ -1281,7 +1282,7 @@
 				targets = wo.filter_initialized || !$input.filter( wo.filter_anyColumnSelector ).length,
 				columns = [],
 				val = $.trim( tsf.getLatestSearch( $input ).attr( 'data-column' ) || '' );
-			if ( !/[,-]/.test(val) && val.length === 1 ) {
+			if ( /^[0-9]+$/.test(val)) {
 				return parseInt( val, 10 );
 			}
 			// process column range
@@ -1495,7 +1496,7 @@
 				!table.config.widgetOptions.filter_initialized ) {
 				return;
 			}
-			var len, norm_rows, rowData, $rows, rowIndex, tbodyIndex, $tbody, columnIndex,
+			var len, norm_rows, rowData, $rows, $row, rowIndex, tbodyIndex, $tbody, columnIndex,
 				isChild, childRow, lastSearch, showRow, time, val, indx,
 				notFiltered, searchFiltered, query, injected, res, id, txt,
 				storedFilters = $.extend( [], filters ),
@@ -1683,24 +1684,37 @@
 								'';
 						}
 
-						showRow = tsf.processRow( c, data, vars );
+						showRow = false;
+						val = tsf.processRow( c, data, vars );
 						childRow = rowData.$row.filter( ':gt( 0 )' );
-
 						if ( wo.filter_childRows && childRow.length ) {
+							if ( !wo.filter_childWithSibs ) {
+								// hide all child rows
+								childRow.addClass( wo.filter_filteredRow );
+							}
 							if ( wo.filter_childByColumn ) {
 								// cycle through each child row
 								for ( indx = 0; indx < childRow.length; indx++ ) {
 									data.$row = childRow.eq( indx );
 									data.cacheArray = rowData.child[ indx ];
 									data.rawArray = data.cacheArray;
+									val = tsf.processRow( c, data, vars );
 									// use OR comparison on child rows
-									showRow = showRow || tsf.processRow( c, data, vars );
+									showRow = showRow || val;
+									if ( !wo.filter_childWithSibs && val ) {
+										childRow.eq( indx ).removeClass( wo.filter_filteredRow );
+									}
 								}
 							}
-							childRow.toggleClass( wo.filter_filteredRow, !showRow );
+						} else {
+							showRow = val;
 						}
-
-						rowData.$row
+						$row = rowData.$row;
+						// if only showing resulting child row, only include parent
+						if ( !wo.filter_childWithSibs ) {
+							$row = $row.eq( 0 );
+						}
+						$row
 							.toggleClass( wo.filter_filteredRow, !showRow )[0]
 							.display = showRow ? '' : 'none';
 					}
@@ -1728,14 +1742,12 @@
 		},
 		getOptionSource: function( table, column, onlyAvail ) {
 			table = $( table )[0];
-			var cts, txt, indx, len,
-				c = table.config,
+			var c = table.config,
 				wo = c.widgetOptions,
-				parsed = [],
 				arry = false,
 				source = wo.filter_selectSource,
 				last = c.$table.data( 'lastSearch' ) || [],
-				fxn = $.isFunction( source ) ? true : ts.getColumnData( table, source, column );
+				fxn = typeof source === 'function' ? true : ts.getColumnData( table, source, column );
 
 			if ( onlyAvail && last[column] !== '' ) {
 				onlyAvail = false;
@@ -1754,11 +1766,25 @@
 				// custom select source function for a SPECIFIC COLUMN
 				arry = fxn( table, column, onlyAvail );
 			}
+
 			if ( arry === false ) {
 				// fall back to original method
 				arry = tsf.getOptions( table, column, onlyAvail );
 			}
 
+			return tsf.processOptions( table, column, arry );
+
+		},
+		processOptions: function( table, column, arry ) {
+			if ( !$.isArray( arry ) ) {
+				return false;
+			}
+			table = $( table )[0];
+			var cts, txt, indx, len,
+				c = table.config,
+				validColumn = typeof column !== 'undefined' && column !== null && column >= 0 && column < c.columns,
+				parsed = [];
+
 			// get unique elements and sort the list
 			// if $.tablesorter.sortText exists ( not in the original tablesorter ),
 			// then natural sort the list otherwise use a basic sort
@@ -1766,7 +1792,7 @@
 				return $.inArray( value, arry ) === indx;
 			});
 
-			if ( c.$headerIndexed[ column ].hasClass( 'filter-select-nosort' ) ) {
+			if ( validColumn && c.$headerIndexed[ column ].hasClass( 'filter-select-nosort' ) ) {
 				// unsorted select options
 				return arry;
 			} else {
@@ -1779,7 +1805,8 @@
 					parsed.push({
 						t : txt,
 						// check parser length - fixes #934
-						p : c.parsers && c.parsers.length && c.parsers[ column ].format( txt, table, [], column ) || txt
+						p : validColumn && c.parsers && c.parsers.length &&
+							c.parsers[ column ].format( txt, table, [], column ) || txt
 					});
 				}
 
@@ -1789,10 +1816,10 @@
 					// sortNatural breaks if you don't pass it strings
 					var x = a.p.toString(),
 						y = b.p.toString();
-					if ( $.isFunction( cts ) ) {
+					if ( validColumn && typeof cts === 'function' ) {
 						// custom OVERALL text sorter
 						return cts( x, y, true, column, table );
-					} else if ( typeof cts === 'object' && cts.hasOwnProperty( column ) ) {
+					} else if ( validColumn && typeof cts === 'object' && cts.hasOwnProperty( column ) ) {
 						// custom text sorter for a SPECIFIC COLUMN
 						return cts[column]( x, y, true, column, table );
 					} else if ( ts.sortNatural ) {
@@ -1850,6 +1877,7 @@
 			if ( !table.config.cache || $.isEmptyObject( table.config.cache ) ) {
 				return;
 			}
+
 			var indx, val, txt, t, $filters, $filter,
 				c = table.config,
 				wo = c.widgetOptions,
@@ -1865,6 +1893,7 @@
 					.find( 'thead' )
 					.find( 'select.' + tscss.filter + '[data-column="' + column + '"]' )
 					.val();
+
 			// nothing included in arry ( external source ), so get the options from
 			// filter_selectSource or column data
 			if ( typeof arry === 'undefined' || arry === '' ) {

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

@@ -1,4 +1,4 @@
-/*! Widget: filter - updated 9/1/2015 (v2.23.3) *//*
+/*! Widget: filter - updated 9/23/2015 (v2.23.4) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -21,6 +21,7 @@
 		options : {
 			filter_childRows     : false, // if true, filter includes child row content in the search
 			filter_childByColumn : false, // ( filter_childRows must be true ) if true = search child rows by column; false = search all child row text grouped
+			filter_childWithSibs : true,  // if true, include matching child row siblings
 			filter_columnFilters : true,  // if true, a filter will be added to the top of each table column
 			filter_columnAnyMatch: true,  // if true, allows using '#:{query}' in AnyMatch searches ( column:query )
 			filter_cellFilter    : '',    // css class name added to the filter cell ( string or array )
@@ -357,7 +358,7 @@
 			c.$table.addClass( 'hasFilters' );
 
 			// define timers so using clearTimeout won't cause an undefined error
-			wo.searchTimer = null;
+			wo.filter_searchTimer = null;
 			wo.filter_initTimer = null;
 			wo.filter_formatterCount = 0;
 			wo.filter_formatterInit = [];
@@ -490,7 +491,7 @@
 								.find( 'select.' + tscss.filter + '[data-column="' + column + '"]' )
 								.append( options );
 							txt = wo.filter_selectSource;
-							fxn = $.isFunction( txt ) ? true : ts.getColumnData( table, txt, column );
+							fxn = typeof txt === 'function' ? true : ts.getColumnData( table, txt, column );
 							if ( fxn ) {
 								// updating so the extra options are appended
 								tsf.buildSelect( c.table, column, '', true, $header.hasClass( wo.filter_onlyAvail ) );
@@ -509,7 +510,7 @@
 			}
 
 			if ( wo.filter_hideFilters ) {
-				tsf.hideFilters( table, c );
+				tsf.hideFilters( c );
 			}
 
 			// show processing icon
@@ -636,7 +637,7 @@
 			return parsed ? c.parsers[column].format( filter, c.table, [], column ) : filter;
 		},
 		buildRow: function( table, c, wo ) {
-			var col, column, $header, buildSelect, disabled, name, ffxn, tmp,
+			var col, column, $header, makeSelect, disabled, name, ffxn, tmp,
 				// c.columns defined in computeThIndexes()
 				cellFilter = wo.filter_cellFilter,
 				columns = c.columns,
@@ -660,14 +661,14 @@
 				// assuming last cell of a column is the main column
 				$header = c.$headerIndexed[ column ];
 				ffxn = ts.getColumnData( table, wo.filter_functions, column );
-				buildSelect = ( wo.filter_functions && ffxn && typeof ffxn !== 'function' ) ||
+				makeSelect = ( wo.filter_functions && ffxn && typeof ffxn !== 'function' ) ||
 					$header.hasClass( 'filter-select' );
 				// get data from jQuery data, metadata, headers option or header class name
 				col = ts.getColumnData( table, c.headers, column );
 				disabled = ts.getData( $header[0], col, 'filter' ) === 'false' ||
 					ts.getData( $header[0], col, 'parser' ) === 'false';
 
-				if ( buildSelect ) {
+				if ( makeSelect ) {
 					buildFilter = $( '<select>' ).appendTo( c.$filters.eq( column ) );
 				} else {
 					ffxn = ts.getColumnData( table, wo.filter_formatter, column );
@@ -769,10 +770,10 @@
 		},
 		searching: function( table, filter, skipFirst ) {
 			var wo = table.config.widgetOptions;
-			clearTimeout( wo.searchTimer );
+			clearTimeout( wo.filter_searchTimer );
 			if ( typeof filter === 'undefined' || filter === true ) {
 				// delay filtering
-				wo.searchTimer = setTimeout( function() {
+				wo.filter_searchTimer = setTimeout( function() {
 					tsf.checkFilters( table, filter, skipFirst );
 				}, wo.filter_liveSearch ? wo.filter_searchDelay : 10 );
 			} else {
@@ -830,7 +831,7 @@
 				return false;
 			}
 		},
-		hideFilters: function( table, c ) {
+		hideFilters: function( c ) {
 			var timer;
 			c.$table
 				.find( '.' + tscss.filterRow )
@@ -907,7 +908,7 @@
 				targets = wo.filter_initialized || !$input.filter( wo.filter_anyColumnSelector ).length,
 				columns = [],
 				val = $.trim( tsf.getLatestSearch( $input ).attr( 'data-column' ) || '' );
-			if ( !/[,-]/.test(val) && val.length === 1 ) {
+			if ( /^[0-9]+$/.test(val)) {
 				return parseInt( val, 10 );
 			}
 			// process column range
@@ -1121,7 +1122,7 @@
 				!table.config.widgetOptions.filter_initialized ) {
 				return;
 			}
-			var len, norm_rows, rowData, $rows, rowIndex, tbodyIndex, $tbody, columnIndex,
+			var len, norm_rows, rowData, $rows, $row, rowIndex, tbodyIndex, $tbody, columnIndex,
 				isChild, childRow, lastSearch, showRow, time, val, indx,
 				notFiltered, searchFiltered, query, injected, res, id, txt,
 				storedFilters = $.extend( [], filters ),
@@ -1309,24 +1310,37 @@
 								'';
 						}
 
-						showRow = tsf.processRow( c, data, vars );
+						showRow = false;
+						val = tsf.processRow( c, data, vars );
 						childRow = rowData.$row.filter( ':gt( 0 )' );
-
 						if ( wo.filter_childRows && childRow.length ) {
+							if ( !wo.filter_childWithSibs ) {
+								// hide all child rows
+								childRow.addClass( wo.filter_filteredRow );
+							}
 							if ( wo.filter_childByColumn ) {
 								// cycle through each child row
 								for ( indx = 0; indx < childRow.length; indx++ ) {
 									data.$row = childRow.eq( indx );
 									data.cacheArray = rowData.child[ indx ];
 									data.rawArray = data.cacheArray;
+									val = tsf.processRow( c, data, vars );
 									// use OR comparison on child rows
-									showRow = showRow || tsf.processRow( c, data, vars );
+									showRow = showRow || val;
+									if ( !wo.filter_childWithSibs && val ) {
+										childRow.eq( indx ).removeClass( wo.filter_filteredRow );
+									}
 								}
 							}
-							childRow.toggleClass( wo.filter_filteredRow, !showRow );
+						} else {
+							showRow = val;
 						}
-
-						rowData.$row
+						$row = rowData.$row;
+						// if only showing resulting child row, only include parent
+						if ( !wo.filter_childWithSibs ) {
+							$row = $row.eq( 0 );
+						}
+						$row
 							.toggleClass( wo.filter_filteredRow, !showRow )[0]
 							.display = showRow ? '' : 'none';
 					}
@@ -1354,14 +1368,12 @@
 		},
 		getOptionSource: function( table, column, onlyAvail ) {
 			table = $( table )[0];
-			var cts, txt, indx, len,
-				c = table.config,
+			var c = table.config,
 				wo = c.widgetOptions,
-				parsed = [],
 				arry = false,
 				source = wo.filter_selectSource,
 				last = c.$table.data( 'lastSearch' ) || [],
-				fxn = $.isFunction( source ) ? true : ts.getColumnData( table, source, column );
+				fxn = typeof source === 'function' ? true : ts.getColumnData( table, source, column );
 
 			if ( onlyAvail && last[column] !== '' ) {
 				onlyAvail = false;
@@ -1380,11 +1392,25 @@
 				// custom select source function for a SPECIFIC COLUMN
 				arry = fxn( table, column, onlyAvail );
 			}
+
 			if ( arry === false ) {
 				// fall back to original method
 				arry = tsf.getOptions( table, column, onlyAvail );
 			}
 
+			return tsf.processOptions( table, column, arry );
+
+		},
+		processOptions: function( table, column, arry ) {
+			if ( !$.isArray( arry ) ) {
+				return false;
+			}
+			table = $( table )[0];
+			var cts, txt, indx, len,
+				c = table.config,
+				validColumn = typeof column !== 'undefined' && column !== null && column >= 0 && column < c.columns,
+				parsed = [];
+
 			// get unique elements and sort the list
 			// if $.tablesorter.sortText exists ( not in the original tablesorter ),
 			// then natural sort the list otherwise use a basic sort
@@ -1392,7 +1418,7 @@
 				return $.inArray( value, arry ) === indx;
 			});
 
-			if ( c.$headerIndexed[ column ].hasClass( 'filter-select-nosort' ) ) {
+			if ( validColumn && c.$headerIndexed[ column ].hasClass( 'filter-select-nosort' ) ) {
 				// unsorted select options
 				return arry;
 			} else {
@@ -1405,7 +1431,8 @@
 					parsed.push({
 						t : txt,
 						// check parser length - fixes #934
-						p : c.parsers && c.parsers.length && c.parsers[ column ].format( txt, table, [], column ) || txt
+						p : validColumn && c.parsers && c.parsers.length &&
+							c.parsers[ column ].format( txt, table, [], column ) || txt
 					});
 				}
 
@@ -1415,10 +1442,10 @@
 					// sortNatural breaks if you don't pass it strings
 					var x = a.p.toString(),
 						y = b.p.toString();
-					if ( $.isFunction( cts ) ) {
+					if ( validColumn && typeof cts === 'function' ) {
 						// custom OVERALL text sorter
 						return cts( x, y, true, column, table );
-					} else if ( typeof cts === 'object' && cts.hasOwnProperty( column ) ) {
+					} else if ( validColumn && typeof cts === 'object' && cts.hasOwnProperty( column ) ) {
 						// custom text sorter for a SPECIFIC COLUMN
 						return cts[column]( x, y, true, column, table );
 					} else if ( ts.sortNatural ) {
@@ -1476,6 +1503,7 @@
 			if ( !table.config.cache || $.isEmptyObject( table.config.cache ) ) {
 				return;
 			}
+
 			var indx, val, txt, t, $filters, $filter,
 				c = table.config,
 				wo = c.widgetOptions,
@@ -1491,6 +1519,7 @@
 					.find( 'thead' )
 					.find( 'select.' + tscss.filter + '[data-column="' + column + '"]' )
 					.val();
+
 			// nothing included in arry ( external source ), so get the options from
 			// filter_selectSource or column data
 			if ( typeof arry === 'undefined' || arry === '' ) {

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

@@ -465,6 +465,10 @@
 					}, 40 );
 				});
 			wo.math_isUpdating = false;
+			// math widget initialized after table - see #946
+			if ( table.hasInitialized ) {
+				math.recalculate( c, wo, true );
+			}
 		},
 		// this remove function is called when using the refreshWidgets method or when destroying the tablesorter plugin
 		// this function only applies to tablesorter v2.4+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-tablesorter
 version: !ruby/object:Gem::Version
-  version: 1.18.3
+  version: 1.18.4
 platform: ruby
 authors:
 - Jun Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties