mirror of
https://github.com/Mottie/tablesorter.git
synced 2024-11-15 23:54:22 +00:00
Filter: select2 filterFormatter code tweaks. Fixes #796.
This commit is contained in:
parent
975102266e
commit
5eeb103f98
@ -44,13 +44,19 @@ ts.filterFormatter.select2 = function($cell, indx, select2Def) {
|
|||||||
|
|
||||||
// this function updates the hidden input and adds the current values to the header cell text
|
// this function updates the hidden input and adds the current values to the header cell text
|
||||||
updateSelect2 = function() {
|
updateSelect2 = function() {
|
||||||
var v = $cell.find('.select2').select2('val') || o.value || '';
|
var arry = false,
|
||||||
|
v = $cell.find('.select2').select2('val') || o.value || '';
|
||||||
// convert array to string
|
// convert array to string
|
||||||
if ($.isArray(v)) { v = v.join('\u0000'); }
|
if ($.isArray(v)) {
|
||||||
|
arry = true;
|
||||||
|
v = v.join('\u0000');
|
||||||
|
}
|
||||||
// escape special regex characters (http://stackoverflow.com/a/9310752/145346)
|
// escape special regex characters (http://stackoverflow.com/a/9310752/145346)
|
||||||
v = v.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
|
v = v.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
|
||||||
// convert string back into an array
|
// convert string back into an array
|
||||||
if (v.indexOf('\u0000')) { v = v.split('\u0000'); }
|
if (arry) {
|
||||||
|
v = v.split('\u0000');
|
||||||
|
}
|
||||||
$input
|
$input
|
||||||
// add regex, so we filter exact numbers
|
// add regex, so we filter exact numbers
|
||||||
.val( $.isArray(v) && v.length && v.join('') !== '' ? '/(' + matchPrefix + (v || []).join(matchSuffix + '|' + matchPrefix) + matchSuffix + ')/' : '' )
|
.val( $.isArray(v) && v.length && v.join('') !== '' ? '/(' + matchPrefix + (v || []).join(matchSuffix + '|' + matchPrefix) + matchSuffix + ')/' : '' )
|
||||||
|
Loading…
Reference in New Issue
Block a user