library-mirrors/tablesorter
1
0
Fork 0
mirror of https://github.com/Mottie/tablesorter.git synced 2024-11-15 23:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added compare option to various filterFormatter functions; fixes #304

Browse Source
This commit is contained in:
Mottie 2013-05-13 18:18:57 -05:00
parent 4494da5357
commit 6de26e8119
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/jquery.tablesorter.widgets-filter-formatter.js
View File

@ -2,7 +2,7 @@
* requires: tableSorter 2.7.7+ and jQuery 1.4.3+ * requires: tableSorter 2.7.7+ and jQuery 1.4.3+
* *
* jQuery UI spinner * jQuery UI spinner
* jQuery UI silder * jQuery UI slider
* jQuery UI range slider * jQuery UI range slider
* jQuery UI datepicker (range) * jQuery UI datepicker (range)
* HTML5 number (spinner) * HTML5 number (spinner)
@ -30,6 +30,7 @@ $.tablesorter.filterFormatter = {
addToggle: true, addToggle: true,
disabled: false, disabled: false,
exactMatch: true, exactMatch: true,
compare: '',
numberFormat: "n" numberFormat: "n"
}, spinnerDef ), }, spinnerDef ),
// Add a hidden input to hold the range values // Add a hidden input to hold the range values
@ -44,7 +45,8 @@ $.tablesorter.filterFormatter = {
chkd = $cell.find('.toggle').is(':checked'); chkd = $cell.find('.toggle').is(':checked');
} }
$cell.find('.filter') $cell.find('.filter')
.val( chkd ? v + (o.exactMatch ? '=' : '') : '' ) // add equal to the end, so we filter exact numbers // add equal to the beginning, so we filter exact numbers
.val( chkd ? (o.exactMatch ? '=' : o.compare) + v : '' )
.trigger('search', o.delayed).end() .trigger('search', o.delayed).end()
.find('.spinner').spinner( o.disabled || !chkd ? 'disable' : 'enable' ); .find('.spinner').spinner( o.disabled || !chkd ? 'disable' : 'enable' );
}; };
@ -103,6 +105,7 @@ $.tablesorter.filterFormatter = {
delayed: true, delayed: true,
valueToHeader : false, valueToHeader : false,
exactMatch: true, exactMatch: true,
compare: '',
allText: 'all' allText: 'all'
}, sliderDef ), }, sliderDef ),
// Add a hidden input to hold the range values // Add a hidden input to hold the range values
@ -120,9 +123,11 @@ $.tablesorter.filterFormatter = {
$cell.find('.ui-slider-handle').addClass('value-popup').attr('data-value', v === o.min ? o.allText : v); $cell.find('.ui-slider-handle').addClass('value-popup').attr('data-value', v === o.min ? o.allText : v);
} }
// update the hidden input; // update the hidden input;
// ****** ADD AN EQUAL SIGN TO THE END! <- this makes the slide exactly match the number ****** // ****** ADD AN EQUAL SIGN TO THE BEGINNING! <- this makes the slide exactly match the number ******
// when the value is at the minimum, clear the hidden input so all rows will be seen // when the value is at the minimum, clear the hidden input so all rows will be seen
$cell.find('.filter').val(v === o.min ? '' : v + (o.exactMatch ? '=' : '')).trigger('search', o.delayed); $cell.find('.filter')
.val(v === o.min ? '' : (o.exactMatch ? '=' : o.compare) + v)
.trigger('search', o.delayed);
}; };
$cell.closest('thead').find('th[data-column=' + indx + ']').addClass('filter-parsed'); $cell.closest('thead').find('th[data-column=' + indx + ']').addClass('filter-parsed');
@ -293,7 +298,8 @@ $.tablesorter.filterFormatter = {
delayed: true, delayed: true,
disabled: false, disabled: false,
addToggle: true, addToggle: true,
exactMatch: true exactMatch: true,
compare: ''
}, def5Num), }, def5Num),
// test browser for HTML5 range support // test browser for HTML5 range support
@ -303,8 +309,9 @@ $.tablesorter.filterFormatter = {
updateNumber = function(){ updateNumber = function(){
var val = $cell.find('.number').val(), var val = $cell.find('.number').val(),
chkd = o.addToggle ? $cell.find('.toggle').is(':checked') : true; chkd = o.addToggle ? $cell.find('.toggle').is(':checked') : true;
$cell $cell.find('input[type=hidden]')
.find('input[type=hidden]').val( chkd ? val + (o.exactMatch ? '=' : '') : '' ) // add equal to the end, so we filter exact numbers // add equal to the beginning, so we filter exact numbers
.val( chkd ? (o.exactMatch ? '=' : o.compare) + val : '' )
.trigger('search', o.delayed); .trigger('search', o.delayed);
if ($cell.find('.number').length) { if ($cell.find('.number').length) {
$cell.find('.number')[0].disabled = (o.disabled || !chkd); $cell.find('.number')[0].disabled = (o.disabled || !chkd);
@ -348,6 +355,7 @@ $.tablesorter.filterFormatter = {
delayed: true, delayed: true,
valueToHeader: true, valueToHeader: true,
exactMatch: true, exactMatch: true,
compare: '',
allText: 'all' allText: 'all'
}, def5Range), }, def5Range),
@ -359,8 +367,9 @@ $.tablesorter.filterFormatter = {
updateRange = function(){ updateRange = function(){
/*jshint eqeqeq:false */ /*jshint eqeqeq:false */
var val = $cell.find('.range').val(); var val = $cell.find('.range').val();
$cell $cell.find('input[type=hidden]')
.find('input[type=hidden]').val( val == o.min ? '' : val + (o.exactMatch ? '=' : '')) // add equal to the end, so we filter exact numbers // add equal to the beginning, so we filter exact numbers
.val( val == o.min ? '' : (o.exactMatch ? '=' : o.compare) + val)
.trigger('search', o.delayed); .trigger('search', o.delayed);
// or add current color to the header cell, if desired // or add current color to the header cell, if desired
$cell.closest('thead').find('th[data-column=' + indx + ']').find('.curvalue').html(' (' + (val == o.min ? o.allText : val) + ')'); $cell.closest('thead').find('th[data-column=' + indx + ']').find('.curvalue').html(' (' + (val == o.min ? o.allText : val) + ')');
@ -415,8 +424,8 @@ $.tablesorter.filterFormatter = {
if ($cell.find('.colorpicker').length) { if ($cell.find('.colorpicker').length) {
$cell.find('.colorpicker')[0].disabled = (o.disabled || !chkd); $cell.find('.colorpicker')[0].disabled = (o.disabled || !chkd);
} }
$cell $cell.find('input[type=hidden]')
.find('input[type=hidden]').val( chkd ? val + (o.exactMatch ? '=' : '') : '' ) .val( chkd ? val + (o.exactMatch ? '=' : '') : '' )
.trigger('search'); .trigger('search');
if (o.valueToHeader) { if (o.valueToHeader) {
// add current color to the header cell // add current color to the header cell