Filter: prevent error when using anymatch & no external input

This commit is contained in:
Mottie 2015-02-20 14:16:42 -06:00
parent b9b09922a3
commit d78f3b032b

View File

@ -712,9 +712,12 @@ ts.filter = {
return val; return val;
}, },
getLatestSearch: function( $input ) { getLatestSearch: function( $input ) {
return $input.sort(function(a, b) { if ($input) {
return $(b).attr('data-lastSearchTime') - $(a).attr('data-lastSearchTime'); return $input.sort(function(a, b) {
}); return $(b).attr('data-lastSearchTime') - $(a).attr('data-lastSearchTime');
});
}
return $();
}, },
multipleColumns: function( c, $input ) { multipleColumns: function( c, $input ) {
// look for multiple columns "1-3,4-6,8" in data-column // look for multiple columns "1-3,4-6,8" in data-column
@ -724,7 +727,7 @@ ts.filter = {
// & don't target "all" column inputs if they don't exist // & don't target "all" column inputs if they don't exist
targets = wo.filter_initialized || !$input.filter(wo.filter_anyColumnSelector).length, targets = wo.filter_initialized || !$input.filter(wo.filter_anyColumnSelector).length,
columns = [], columns = [],
val = $.trim( ts.filter.getLatestSearch( $input ).attr('data-column') ); val = $.trim( ts.filter.getLatestSearch( $input ).attr('data-column') || '' );
// process column range // process column range
if ( targets && /-/.test( val ) ) { if ( targets && /-/.test( val ) ) {
ranges = val.match( /(\d+)\s*-\s*(\d+)/g ); ranges = val.match( /(\d+)\s*-\s*(\d+)/g );