library-mirrors/tablesorter
1
0
Fork 0
mirror of https://github.com/Mottie/tablesorter.git synced 2024-12-05 05:04:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Filter: prevent OR filter type from splitting up regex string. See #1070

Browse Source
This commit is contained in:
Rob Garrison 2015-11-09 10:50:49 -06:00
parent 2ac96256ac
commit d56c621456
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/js/widgets/widget-filter.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -110,7 +110,9 @@
// data.parsed = array ( by column ) of boolean values ( from filter_useParsedData or 'filter-parsed' class ) // data.parsed = array ( by column ) of boolean values ( from filter_useParsedData or 'filter-parsed' class )
types: { types: {
or : function( c, data, vars ) { or : function( c, data, vars ) {
if ( tsf.regex.orTest.test( data.iFilter ) || tsf.regex.orSplit.test( data.filter ) ) { // look for "|", but not if it is inside of a regular expression
if ( ( tsf.regex.orTest.test( data.iFilter ) || tsf.regex.orSplit.test( data.filter ) ) &&
!tsf.regex.regex.test( data.filter ) ) {
var indx, filterMatched, query, regex, var indx, filterMatched, query, regex,
// duplicate data but split filter // duplicate data but split filter
data2 = $.extend( {}, data ), data2 = $.extend( {}, data ),