jquery-tablesorter 1.18.4 → 1.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f25b2d1c32020eb01d61f3b5b36078ea6c6ac85
-  data.tar.gz: 3d8e1b92751a59e9f79aaa7989bd0303fec33118
+  metadata.gz: da76e8ae00079abf20ffbea4b67603190b80c980
+  data.tar.gz: 7963ec0c04fe46d8778e3e0b33da06580298ebec
 SHA512:
-  metadata.gz: 2abcb7450f22141441bb95ca5044426d0041d3430e2fb96a5fd6421ee2fc5ce0e45798d253366c7a4641a0e3735c94ba28b0bbe45a55ff0978ae323864fc0198
-  data.tar.gz: c7ec726ac20494eceb26014dcfb791b47c256ee8f6ffe86a6765ccae79c071c6483ea4a9832edcd95bd9a1a607e911612de52845d5d0382e2b15e69a9a94c6bc
+  metadata.gz: 361586f4f8b282499f267bfcf326c015cb2ea64b09a0d543c728be3a5d5d1c3db0252873a9a15308c77326c0331c996b32286aa8509b41c667fe1bdd82849002
+  data.tar.gz: 2c03c0980a775df3e1b85072f7db106af5acb5c139faba98c9f2e8b04c7a4cbf94e6315c3a3601ea4d6b4dacb9af2b4b1f88dabc62f27c37975f32e29cde9b47

data/README.md

@@ -4,7 +4,7 @@
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current tablesorter version: 2.23.4 (9/23/2015), [documentation]
+Current tablesorter version: 2.23.5 (10/4/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.4'
+  VERSION = '1.18.5'
 end

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

@@ -1,6 +1,6 @@
 /*!
  * tablesorter (FORK) pager plugin
- * updated 8/19/2015 (v2.23.1)
+ * updated 10/4/2015 (v2.23.5)
  */
 /*jshint browser:true, jquery:true, unused:false */
 ;(function($) {
@@ -618,8 +618,7 @@
 				}
 				$t.trigger('pagerChange', p);
 			}
-
-			if ( !p.removeRows ) {
+			if ( !p.removeRows && !p.showAll ) {
 				hideRows(table, p);
 			} else {
 				ts.clearTableBody(table);
@@ -656,17 +655,18 @@
 			if ( p.ajax ) {
 				pagerArrows(p, true);
 			} else {
-				p.isDisabled = true;
 				$.data(table, 'pagerLastPage', p.page);
 				$.data(table, 'pagerLastSize', p.size);
 				p.page = 0;
 				p.size = p.totalRows;
 				p.totalPages = 1;
+				p.showAll = true;
 				$(table)
 					.addClass('pagerDisabled')
 					.removeAttr('aria-describedby')
 					.find('tr.pagerSavedHeightSpacer').remove();
 				renderTable(table, table.config.rowsCopy, p);
+				p.isDisabled = true;
 				$(table).trigger('applyWidgets');
 				if (table.config.debug) {
 					console.log('Pager: Disabled');
@@ -826,6 +826,7 @@
 				.removeAttr('disabled')
 				.attr('aria-disabled', 'false');
 			p.isDisabled = false;
+			p.showAll = false;
 			p.page = $.data(table, 'pagerLastPage') || p.page || 0;
 			p.size = $.data(table, 'pagerLastSize') || parseInt(p.$size.find('option[selected]').val(), 10) || p.size || p.settings.size || 10;
 			p.$size.val(p.size); // set page size
@@ -882,6 +883,7 @@
 				p.oldAjaxSuccess = p.oldAjaxSuccess || p.ajaxObject.success;
 				c.appender = $this.appender;
 				p.initializing = true;
+				p.showAll = false;
 				if (p.savePages && ts.storage) {
 					t = ts.storage(table, p.storageKey) || {}; // fixes #387
 					p.page = isNaN(t.page) ? p.page : t.page;

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

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀   ▀▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 09-23-2015 (v2.23.4)*/
+/*! tablesorter (FORK) - updated 10-04-2015 (v2.23.5)*/
 /* 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.4 *//*
+/*! TableSorter (FORK) v2.23.5 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -43,7 +43,7 @@
 
 			var ts = this;
 
-			ts.version = '2.23.4';
+			ts.version = '2.23.5';
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -531,19 +531,27 @@
 			}
 
 			function updateHeader(table) {
-				var index, s, $th, col,
+				var index, isDisabled, $th, col,
 					c = table.config,
 					len = c.$headers.length;
 				for ( index = 0; index < len; index++ ) {
 					$th = c.$headers.eq( index );
 					col = ts.getColumnData( table, c.headers, index, true );
 					// add 'sorter-false' class if 'parser-false' is set
-					s = ts.getData( $th, col, 'sorter' ) === 'false' || ts.getData( $th, col, 'parser' ) === 'false';
-					$th[0].sortDisabled = s;
-					$th[ s ? 'addClass' : 'removeClass' ]('sorter-false').attr('aria-disabled', '' + s);
+					isDisabled = ts.getData( $th, col, 'sorter' ) === 'false' || ts.getData( $th, col, 'parser' ) === 'false';
+					$th[0].sortDisabled = isDisabled;
+					$th[ isDisabled ? 'addClass' : 'removeClass' ]( 'sorter-false' ).attr( 'aria-disabled', '' + isDisabled );
+					// disable tab index on disabled cells
+					if ( c.tabIndex ) {
+						if ( isDisabled ) {
+							$th.removeAttr( 'tabindex' );
+						} else {
+							$th.attr( 'tabindex', '0' );
+						}
+					}
 					// aria-controls - requires table ID
 					if (table.id) {
-						if (s) {
+						if ( isDisabled ) {
 							$th.removeAttr('aria-controls');
 						} else {
 							$th.attr('aria-controls', table.id);
@@ -2716,7 +2724,7 @@
 
 })(jQuery);
 
-/*! Widget: filter - updated 9/23/2015 (v2.23.4) *//*
+/*! Widget: filter - updated 10/4/2015 (v2.23.5) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -2820,8 +2828,8 @@
 		// data.filters = array of filters for all columns ( some may be undefined )
 		// data.filter = filter for the current column
 		// data.iFilter = same as data.filter, except lowercase ( if wo.filter_ignoreCase is true )
-		// data.exact = table cell text ( or parsed data if column parser enabled )
-		// data.iExact = same as data.exact, except lowercase ( if wo.filter_ignoreCase is true )
+		// data.exact = table cell text ( or parsed data if column parser enabled; may be a number & not a string )
+		// data.iExact = same as data.exact, except lowercase ( if wo.filter_ignoreCase is true; may be a number & not a string )
 		// data.cache = table cell text from cache, so it has been parsed ( & in all lower case if c.ignoreCase is true )
 		// data.cacheArray = An array of parsed content from each table cell in the row being processed
 		// data.index = column index; table = table element ( DOM )
@@ -3802,7 +3810,8 @@
 						if ( fxn === true || hasSelect ) {
 							// default selector uses exact match unless 'filter-match' class is found
 							filterMatched = data.isMatch ?
-								data.iExact.search( data.iFilter ) >= 0 :
+								// data.iExact may be a number
+								( '' + data.iExact ).search( data.iFilter ) >= 0 :
 								data.filter === data.exact;
 						} else if ( typeof fxn === 'function' ) {
 							// filter callback( exact cell content, parser normalized content,
@@ -3841,7 +3850,7 @@
 				return;
 			}
 			var len, norm_rows, rowData, $rows, $row, rowIndex, tbodyIndex, $tbody, columnIndex,
-				isChild, childRow, lastSearch, showRow, time, val, indx,
+				isChild, childRow, lastSearch, showRow, showParent, time, val, indx,
 				notFiltered, searchFiltered, query, injected, res, id, txt,
 				storedFilters = $.extend( [], filters ),
 				regex = tsf.regex,
@@ -4021,7 +4030,7 @@
 							// a match anywhere in the child row, then it will make the row visible
 							// checked here so the option can be changed dynamically
 							for ( indx = 0; indx < childRow.length; indx++ ) {
-								txt += ' ' + childRow[indx].join( '' ) || '';
+								txt += ' ' + childRow[indx].join( ' ' ) || '';
 							}
 							data.childRowText = wo.filter_childRows ?
 								( wo.filter_ignoreCase ? txt.toLowerCase() : txt ) :
@@ -4029,14 +4038,20 @@
 						}
 
 						showRow = false;
-						val = tsf.processRow( c, data, vars );
+						showParent = tsf.processRow( c, data, vars );
+						$row = rowData.$row;
+
+						// don't pass reference to val
+						val = showParent ? true : false;
 						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 ) {
+								if ( !wo.filter_childWithSibs ) {
+									// hide all child rows
+									childRow.addClass( wo.filter_filteredRow );
+									// if only showing resulting child row, only include parent
+									$row = $row.eq( 0 );
+								}
 								// cycle through each child row
 								for ( indx = 0; indx < childRow.length; indx++ ) {
 									data.$row = childRow.eq( indx );
@@ -4050,14 +4065,11 @@
 									}
 								}
 							}
+							// keep parent row match even if no child matches... see #1020
+							showRow = showRow || showParent;
 						} else {
 							showRow = val;
 						}
-						$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';
@@ -4184,7 +4196,7 @@
 		},
 		getOptions: function( table, column, onlyAvail ) {
 			table = $( table )[0];
-			var rowIndex, tbodyIndex, len, row, cache,
+			var rowIndex, tbodyIndex, len, row, cache, indx, child, childLen,
 				c = table.config,
 				wo = c.widgetOptions,
 				arry = [];
@@ -4207,9 +4219,24 @@
 						c.parsers[column].parsed ||
 						c.$headerIndexed[column].hasClass( 'filter-parsed' ) ) {
 						arry.push( '' + cache.normalized[ rowIndex ][ column ] );
+						// child row parsed data
+						if ( wo.filter_childRows && wo.filter_childByColumn ) {
+							childLen = cache.normalized[ rowIndex ][ c.columns ].$row.length - 1;
+							for ( indx = 0; indx < childLen; indx++ ) {
+								arry.push( '' + cache.normalized[ rowIndex ][ c.columns ].child[ indx ][ column ] );
+							}
+						}
 					} else {
 						// get raw cached data instead of content directly from the cells
 						arry.push( cache.normalized[ rowIndex ][ c.columns ].raw[ column ] );
+						// child row unparsed data
+						if ( wo.filter_childRows && wo.filter_childByColumn ) {
+							childLen = cache.normalized[ rowIndex ][ c.columns ].$row.length;
+							for ( indx = 1; indx < childLen; indx++ ) {
+								child =  cache.normalized[ rowIndex ][ c.columns ].$row.eq( indx ).children().eq( column );
+								arry.push( '' + ts.getElementText( c, child, column ) );
+							}
+						}
 					}
 				}
 			}

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

@@ -1,4 +1,4 @@
-/*! TableSorter (FORK) v2.23.4 *//*
+/*! TableSorter (FORK) v2.23.5 *//*
 * Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
@@ -25,7 +25,7 @@
 
 			var ts = this;
 
-			ts.version = '2.23.4';
+			ts.version = '2.23.5';
 
 			ts.parsers = [];
 			ts.widgets = [];
@@ -513,19 +513,27 @@
 			}
 
 			function updateHeader(table) {
-				var index, s, $th, col,
+				var index, isDisabled, $th, col,
 					c = table.config,
 					len = c.$headers.length;
 				for ( index = 0; index < len; index++ ) {
 					$th = c.$headers.eq( index );
 					col = ts.getColumnData( table, c.headers, index, true );
 					// add 'sorter-false' class if 'parser-false' is set
-					s = ts.getData( $th, col, 'sorter' ) === 'false' || ts.getData( $th, col, 'parser' ) === 'false';
-					$th[0].sortDisabled = s;
-					$th[ s ? 'addClass' : 'removeClass' ]('sorter-false').attr('aria-disabled', '' + s);
+					isDisabled = ts.getData( $th, col, 'sorter' ) === 'false' || ts.getData( $th, col, 'parser' ) === 'false';
+					$th[0].sortDisabled = isDisabled;
+					$th[ isDisabled ? 'addClass' : 'removeClass' ]( 'sorter-false' ).attr( 'aria-disabled', '' + isDisabled );
+					// disable tab index on disabled cells
+					if ( c.tabIndex ) {
+						if ( isDisabled ) {
+							$th.removeAttr( 'tabindex' );
+						} else {
+							$th.attr( 'tabindex', '0' );
+						}
+					}
 					// aria-controls - requires table ID
 					if (table.id) {
-						if (s) {
+						if ( isDisabled ) {
 							$th.removeAttr('aria-controls');
 						} else {
 							$th.attr('aria-controls', table.id);

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

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀   ▀▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 09-23-2015 (v2.23.4)*/
+/*! tablesorter (FORK) - updated 10-04-2015 (v2.23.5)*/
 /* 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/23/2015 (v2.23.4) *//*
+/*! Widget: filter - updated 10/4/2015 (v2.23.5) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -476,8 +476,8 @@
 		// data.filters = array of filters for all columns ( some may be undefined )
 		// data.filter = filter for the current column
 		// data.iFilter = same as data.filter, except lowercase ( if wo.filter_ignoreCase is true )
-		// data.exact = table cell text ( or parsed data if column parser enabled )
-		// data.iExact = same as data.exact, except lowercase ( if wo.filter_ignoreCase is true )
+		// data.exact = table cell text ( or parsed data if column parser enabled; may be a number & not a string )
+		// data.iExact = same as data.exact, except lowercase ( if wo.filter_ignoreCase is true; may be a number & not a string )
 		// data.cache = table cell text from cache, so it has been parsed ( & in all lower case if c.ignoreCase is true )
 		// data.cacheArray = An array of parsed content from each table cell in the row being processed
 		// data.index = column index; table = table element ( DOM )
@@ -1458,7 +1458,8 @@
 						if ( fxn === true || hasSelect ) {
 							// default selector uses exact match unless 'filter-match' class is found
 							filterMatched = data.isMatch ?
-								data.iExact.search( data.iFilter ) >= 0 :
+								// data.iExact may be a number
+								( '' + data.iExact ).search( data.iFilter ) >= 0 :
 								data.filter === data.exact;
 						} else if ( typeof fxn === 'function' ) {
 							// filter callback( exact cell content, parser normalized content,
@@ -1497,7 +1498,7 @@
 				return;
 			}
 			var len, norm_rows, rowData, $rows, $row, rowIndex, tbodyIndex, $tbody, columnIndex,
-				isChild, childRow, lastSearch, showRow, time, val, indx,
+				isChild, childRow, lastSearch, showRow, showParent, time, val, indx,
 				notFiltered, searchFiltered, query, injected, res, id, txt,
 				storedFilters = $.extend( [], filters ),
 				regex = tsf.regex,
@@ -1677,7 +1678,7 @@
 							// a match anywhere in the child row, then it will make the row visible
 							// checked here so the option can be changed dynamically
 							for ( indx = 0; indx < childRow.length; indx++ ) {
-								txt += ' ' + childRow[indx].join( '' ) || '';
+								txt += ' ' + childRow[indx].join( ' ' ) || '';
 							}
 							data.childRowText = wo.filter_childRows ?
 								( wo.filter_ignoreCase ? txt.toLowerCase() : txt ) :
@@ -1685,14 +1686,20 @@
 						}
 
 						showRow = false;
-						val = tsf.processRow( c, data, vars );
+						showParent = tsf.processRow( c, data, vars );
+						$row = rowData.$row;
+
+						// don't pass reference to val
+						val = showParent ? true : false;
 						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 ) {
+								if ( !wo.filter_childWithSibs ) {
+									// hide all child rows
+									childRow.addClass( wo.filter_filteredRow );
+									// if only showing resulting child row, only include parent
+									$row = $row.eq( 0 );
+								}
 								// cycle through each child row
 								for ( indx = 0; indx < childRow.length; indx++ ) {
 									data.$row = childRow.eq( indx );
@@ -1706,14 +1713,11 @@
 									}
 								}
 							}
+							// keep parent row match even if no child matches... see #1020
+							showRow = showRow || showParent;
 						} else {
 							showRow = val;
 						}
-						$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';
@@ -1840,7 +1844,7 @@
 		},
 		getOptions: function( table, column, onlyAvail ) {
 			table = $( table )[0];
-			var rowIndex, tbodyIndex, len, row, cache,
+			var rowIndex, tbodyIndex, len, row, cache, indx, child, childLen,
 				c = table.config,
 				wo = c.widgetOptions,
 				arry = [];
@@ -1863,9 +1867,24 @@
 						c.parsers[column].parsed ||
 						c.$headerIndexed[column].hasClass( 'filter-parsed' ) ) {
 						arry.push( '' + cache.normalized[ rowIndex ][ column ] );
+						// child row parsed data
+						if ( wo.filter_childRows && wo.filter_childByColumn ) {
+							childLen = cache.normalized[ rowIndex ][ c.columns ].$row.length - 1;
+							for ( indx = 0; indx < childLen; indx++ ) {
+								arry.push( '' + cache.normalized[ rowIndex ][ c.columns ].child[ indx ][ column ] );
+							}
+						}
 					} else {
 						// get raw cached data instead of content directly from the cells
 						arry.push( cache.normalized[ rowIndex ][ c.columns ].raw[ column ] );
+						// child row unparsed data
+						if ( wo.filter_childRows && wo.filter_childByColumn ) {
+							childLen = cache.normalized[ rowIndex ][ c.columns ].$row.length;
+							for ( indx = 1; indx < childLen; indx++ ) {
+								child =  cache.normalized[ rowIndex ][ c.columns ].$row.eq( indx ).children().eq( column );
+								arry.push( '' + ts.getElementText( c, child, column ) );
+							}
+						}
 					}
 				}
 			}

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

@@ -1,4 +1,4 @@
-/*! Widget: filter - updated 9/23/2015 (v2.23.4) *//*
+/*! Widget: filter - updated 10/4/2015 (v2.23.5) *//*
  * Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -102,8 +102,8 @@
 		// data.filters = array of filters for all columns ( some may be undefined )
 		// data.filter = filter for the current column
 		// data.iFilter = same as data.filter, except lowercase ( if wo.filter_ignoreCase is true )
-		// data.exact = table cell text ( or parsed data if column parser enabled )
-		// data.iExact = same as data.exact, except lowercase ( if wo.filter_ignoreCase is true )
+		// data.exact = table cell text ( or parsed data if column parser enabled; may be a number & not a string )
+		// data.iExact = same as data.exact, except lowercase ( if wo.filter_ignoreCase is true; may be a number & not a string )
 		// data.cache = table cell text from cache, so it has been parsed ( & in all lower case if c.ignoreCase is true )
 		// data.cacheArray = An array of parsed content from each table cell in the row being processed
 		// data.index = column index; table = table element ( DOM )
@@ -1084,7 +1084,8 @@
 						if ( fxn === true || hasSelect ) {
 							// default selector uses exact match unless 'filter-match' class is found
 							filterMatched = data.isMatch ?
-								data.iExact.search( data.iFilter ) >= 0 :
+								// data.iExact may be a number
+								( '' + data.iExact ).search( data.iFilter ) >= 0 :
 								data.filter === data.exact;
 						} else if ( typeof fxn === 'function' ) {
 							// filter callback( exact cell content, parser normalized content,
@@ -1123,7 +1124,7 @@
 				return;
 			}
 			var len, norm_rows, rowData, $rows, $row, rowIndex, tbodyIndex, $tbody, columnIndex,
-				isChild, childRow, lastSearch, showRow, time, val, indx,
+				isChild, childRow, lastSearch, showRow, showParent, time, val, indx,
 				notFiltered, searchFiltered, query, injected, res, id, txt,
 				storedFilters = $.extend( [], filters ),
 				regex = tsf.regex,
@@ -1303,7 +1304,7 @@
 							// a match anywhere in the child row, then it will make the row visible
 							// checked here so the option can be changed dynamically
 							for ( indx = 0; indx < childRow.length; indx++ ) {
-								txt += ' ' + childRow[indx].join( '' ) || '';
+								txt += ' ' + childRow[indx].join( ' ' ) || '';
 							}
 							data.childRowText = wo.filter_childRows ?
 								( wo.filter_ignoreCase ? txt.toLowerCase() : txt ) :
@@ -1311,14 +1312,20 @@
 						}
 
 						showRow = false;
-						val = tsf.processRow( c, data, vars );
+						showParent = tsf.processRow( c, data, vars );
+						$row = rowData.$row;
+
+						// don't pass reference to val
+						val = showParent ? true : false;
 						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 ) {
+								if ( !wo.filter_childWithSibs ) {
+									// hide all child rows
+									childRow.addClass( wo.filter_filteredRow );
+									// if only showing resulting child row, only include parent
+									$row = $row.eq( 0 );
+								}
 								// cycle through each child row
 								for ( indx = 0; indx < childRow.length; indx++ ) {
 									data.$row = childRow.eq( indx );
@@ -1332,14 +1339,11 @@
 									}
 								}
 							}
+							// keep parent row match even if no child matches... see #1020
+							showRow = showRow || showParent;
 						} else {
 							showRow = val;
 						}
-						$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';
@@ -1466,7 +1470,7 @@
 		},
 		getOptions: function( table, column, onlyAvail ) {
 			table = $( table )[0];
-			var rowIndex, tbodyIndex, len, row, cache,
+			var rowIndex, tbodyIndex, len, row, cache, indx, child, childLen,
 				c = table.config,
 				wo = c.widgetOptions,
 				arry = [];
@@ -1489,9 +1493,24 @@
 						c.parsers[column].parsed ||
 						c.$headerIndexed[column].hasClass( 'filter-parsed' ) ) {
 						arry.push( '' + cache.normalized[ rowIndex ][ column ] );
+						// child row parsed data
+						if ( wo.filter_childRows && wo.filter_childByColumn ) {
+							childLen = cache.normalized[ rowIndex ][ c.columns ].$row.length - 1;
+							for ( indx = 0; indx < childLen; indx++ ) {
+								arry.push( '' + cache.normalized[ rowIndex ][ c.columns ].child[ indx ][ column ] );
+							}
+						}
 					} else {
 						// get raw cached data instead of content directly from the cells
 						arry.push( cache.normalized[ rowIndex ][ c.columns ].raw[ column ] );
+						// child row unparsed data
+						if ( wo.filter_childRows && wo.filter_childByColumn ) {
+							childLen = cache.normalized[ rowIndex ][ c.columns ].$row.length;
+							for ( indx = 1; indx < childLen; indx++ ) {
+								child =  cache.normalized[ rowIndex ][ c.columns ].$row.eq( indx ).children().eq( column );
+								arry.push( '' + ts.getElementText( c, child, column ) );
+							}
+						}
 					}
 				}
 			}

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

@@ -1,4 +1,4 @@
-/*! Widget: Pager - updated 8/19/2015 (v2.23.1) */
+/*! Widget: Pager - updated 10/4/2015 (v2.23.5) */
 /* Requires tablesorter v2.8+ and jQuery 1.7+
  * by Rob Garrison
  */
@@ -171,6 +171,7 @@
 			p.oldAjaxSuccess = p.oldAjaxSuccess || wo.pager_ajaxObject.success;
 			c.appender = tsp.appender;
 			p.initializing = true;
+			p.showAll = false;
 			if (wo.pager_savePages && ts.storage) {
 				t = ts.storage(table, wo.pager_storageKey) || {}; // fixes #387
 				p.page = ( isNaN(t.page) ? p.page : t.page ) || p.setPage || 0;
@@ -878,7 +879,7 @@
 				}
 				c.$table.trigger('pagerChange', c);
 			}
-			if ( !wo.pager_removeRows ) {
+			if ( !wo.pager_removeRows && !p.showAll ) {
 				tsp.hideRows(table, c);
 			} else {
 				ts.clearTableBody(table);
@@ -921,17 +922,18 @@
 			if ( p.ajax ) {
 				tsp.pagerArrows(c, true);
 			} else {
-				p.isDisabled = true;
 				$.data(table, 'pagerLastPage', p.page);
 				$.data(table, 'pagerLastSize', p.size);
 				p.page = 0;
 				p.size = p.totalRows;
 				p.totalPages = 1;
+				p.showAll = true;
 				c.$table
 					.addClass('pagerDisabled')
 					.removeAttr('aria-describedby')
 					.find('tr.pagerSavedHeightSpacer').remove();
 				tsp.renderTable(table, c.rowsCopy);
+				p.isDisabled = true;
 				c.$table.trigger('applyWidgets');
 				if (c.debug) {
 					console.log('Pager: Disabled');
@@ -1100,6 +1102,7 @@
 		enablePager: function(table, c, triggered){
 			var info, p = c.pager;
 			p.isDisabled = false;
+			p.showAll = false;
 			p.page = $.data(table, 'pagerLastPage') || p.page || 0;
 			p.size = $.data(table, 'pagerLastSize') || parseInt(p.$size.find('option[selected]').val(), 10) || p.size || p.setSize || 10;
 			p.$size.val(p.size); // set page size

metadata

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