library-mirrors/tablesorter
1
0
Fork 0
mirror of https://github.com/Mottie/tablesorter.git synced 2024-10-08 13:44:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Filter: selected column query works again. Fixes #1267

Browse Source 
Broken since a6b25ae4c0
This commit is contained in:
Rob Garrison 2016-07-28 17:39:34 -05:00
parent 2cfa69d512
commit 85c5cf2212
No known key found for this signature in database
GPG Key ID: 0A42D160D71978E1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/widgets/widget-filter.js
View File

@ -1091,6 +1091,7 @@
fxn, ffxn, txt,
wo = c.widgetOptions,
showRow = true,
hasAnyMatchInput = wo.filter_$anyMatch && wo.filter_$anyMatch.length,
// if wo.filter_$anyMatch data-column attribute is changed dynamically
// we don't want to do an "anyMatch" search on one column using data
@ -1100,11 +1101,11 @@
tsf.multipleColumns( c, wo.filter_$anyMatch ) :
[];
data.$cells = data.$row.children();
if ( data.anyMatchFlag && columnIndex.length > 1 || data.anyMatchFilter ) {
if ( data.anyMatchFlag && columnIndex.length > 1 || ( data.anyMatchFilter && !hasAnyMatchInput ) ) {
data.anyMatch = true;
data.isMatch = true;
data.rowArray = data.$cells.map( function( i ) {
if ( $.inArray( i, columnIndex ) > -1 || data.anyMatchFilter ) {
if ( $.inArray( i, columnIndex ) > -1 || ( data.anyMatchFilter && !hasAnyMatchInput ) ) {
if ( data.parsed[ i ] ) {
txt = data.cacheArray[ i ];
} else {