library-mirrors/tablesorter
1
0
Fork 0
mirror of https://github.com/Mottie/tablesorter.git synced 2025-01-12 15:24:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Filter: operator filter searching now properly uses the parser

Browse Source
This commit is contained in:
Mottie 2014-05-01 11:33:27 -05:00
parent 4f17bb771c
commit c586a329d6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/jquery.tablesorter.widgets.js
View File

@ -440,14 +440,16 @@ ts.filter = {
savedSearch = query; savedSearch = query;
// parse filter value in case we're comparing numbers (dates) // parse filter value in case we're comparing numbers (dates)
if (parsed[index] || parser.type === 'numeric') { if (parsed[index] || parser.type === 'numeric') {
cachedValue = parser.format( '' + iFilter.replace(ts.filter.regex.operators, ''), table, c.$headers.eq(index), index ); result = parser.format( $.trim('' + iFilter.replace(ts.filter.regex.operators, '')), table, [], index );
query = ( typeof query === "number" && cachedValue !== '' && !isNaN(cachedValue) ) ? cachedValue : query; query = ( typeof result === "number" && result !== '' && !isNaN(result) ) ? result : query;
} }
// iExact may be numeric - see issue #149; // iExact may be numeric - see issue #149;
// check if cached is defined, because sometimes j goes out of range? (numeric columns) // check if cached is defined, because sometimes j goes out of range? (numeric columns)
cachedValue = ( parsed[index] || parser.type === 'numeric' ) && !isNaN(query) && cached ? cached : cachedValue = ( parsed[index] || parser.type === 'numeric' )&& !isNaN(query) && typeof cached !== 'undefined' ? cached :
isNaN(iExact) ? ts.formatFloat( iExact.replace(ts.filter.regex.nondigit, ''), table) : isNaN(iExact) ? ts.formatFloat( iExact.replace(ts.filter.regex.nondigit, ''), table) :
ts.formatFloat( iExact, table ); ts.formatFloat( iExact, table );
if ( />/.test(iFilter) ) { result = />=/.test(iFilter) ? cachedValue >= query : cachedValue > query; } if ( />/.test(iFilter) ) { result = />=/.test(iFilter) ? cachedValue >= query : cachedValue > query; }
if ( /</.test(iFilter) ) { result = /<=/.test(iFilter) ? cachedValue <= query : cachedValue < query; } if ( /</.test(iFilter) ) { result = /<=/.test(iFilter) ? cachedValue <= query : cachedValue < query; }
// keep showing all rows if nothing follows the operator // keep showing all rows if nothing follows the operator