Filter: ignore childWithSibs when childByColumn is false. See #1020

Also fixed data.childRowText by adding spaces between cell content

dist/js/jquery.tablesorter.combined.js

@@ -1,4 +1,4 @@
-/*! tablesorter (FORK) - updated 09-23-2015 (v2.23.4)*/
+/*! tablesorter (FORK) - updated 09-24-2015 (v2.23.4)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -4024,15 +4024,19 @@
 
 						showRow = false;
 						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_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 );
 								}
-							if ( wo.filter_childByColumn ) {
 								// cycle through each child row
 								for ( indx = 0; indx < childRow.length; indx++ ) {
 									data.$row = childRow.eq( indx );
@@ -4051,11 +4055,6 @@
 						} 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';

dist/js/jquery.tablesorter.widgets.js

@@ -1,4 +1,4 @@
-/*! tablesorter (FORK) - updated 09-23-2015 (v2.23.4)*/
+/*! tablesorter (FORK) - updated 09-24-2015 (v2.23.4)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -1680,15 +1680,19 @@
 
 						showRow = false;
 						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_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 );
 								}
-							if ( wo.filter_childByColumn ) {
 								// cycle through each child row
 								for ( indx = 0; indx < childRow.length; indx++ ) {
 									data.$row = childRow.eq( indx );
@@ -1707,11 +1711,6 @@
 						} 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';

js/jquery.tablesorter.combined.js

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀   ▀▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 09-23-2015 (v2.23.4)*/
+/*! tablesorter (FORK) - updated 09-24-2015 (v2.23.4)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -4030,15 +4030,19 @@
 
 						showRow = false;
 						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_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 );
 								}
-							if ( wo.filter_childByColumn ) {
 								// cycle through each child row
 								for ( indx = 0; indx < childRow.length; indx++ ) {
 									data.$row = childRow.eq( indx );
@@ -4057,11 +4061,6 @@
 						} 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';

js/jquery.tablesorter.widgets.js

@@ -4,7 +4,7 @@
 ██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀   ▀▀▀▀██
 █████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
 */
-/*! tablesorter (FORK) - updated 09-23-2015 (v2.23.4)*/
+/*! tablesorter (FORK) - updated 09-24-2015 (v2.23.4)*/
 /* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -1686,15 +1686,19 @@
 
 						showRow = false;
 						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_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 );
 								}
-							if ( wo.filter_childByColumn ) {
 								// cycle through each child row
 								for ( indx = 0; indx < childRow.length; indx++ ) {
 									data.$row = childRow.eq( indx );
@@ -1713,11 +1717,6 @@
 						} 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';

js/widgets/widget-filter.js

@@ -1312,15 +1312,19 @@
 
 						showRow = false;
 						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_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 );
 								}
-							if ( wo.filter_childByColumn ) {
 								// cycle through each child row
 								for ( indx = 0; indx < childRow.length; indx++ ) {
 									data.$row = childRow.eq( indx );
@@ -1339,11 +1343,6 @@
 						} 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';