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: External filters can set initial values. Fixes #831

Browse Source 
An empty string is better than an undefined filter
This commit is contained in:
Mottie 2015-02-26 08:30:09 -06:00
parent 71f55cec70
commit d3170096b2
5 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/js/jquery.tablesorter.widgets.js vendored
View File

@ -1,4 +1,4 @@
/*! tablesorter (FORK) widgets - updated 02-25-2015 (v2.20.1)*/ /*! tablesorter (FORK) widgets - updated 02-26-2015 (v2.20.1)*/
/* Includes: storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort */ /* Includes: storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort */
/*! Widget: storage */ /*! Widget: storage */
;(function ($, window, document) { ;(function ($, window, document) {
@ -801,7 +801,7 @@ ts.filter = {
}, },
setDefaults: function(table, c, wo) { setDefaults: function(table, c, wo) {
var isArray, saved, indx, var isArray, saved, indx, col, $filters,
// get current (default) filters // get current (default) filters
filters = ts.getFilters(table) || []; filters = ts.getFilters(table) || [];
if (wo.filter_saveFilters && ts.storage) { if (wo.filter_saveFilters && ts.storage) {
@ -812,8 +812,12 @@ ts.filter = {
} }
// if no filters saved, then check default settings // if no filters saved, then check default settings
if (filters.join('') === '') { if (filters.join('') === '') {
for (indx = 0; indx < c.columns; indx++) { // allow adding default setting to external filters
filters[indx] = c.$headers.filter('[data-column="' + indx + '"]:last').attr(wo.filter_defaultAttrib) || filters[indx]; $filters = c.$headers.add( wo.filter_$externalFilters ).filter('[' + wo.filter_defaultAttrib + ']');
for (indx = 0; indx <= c.columns; indx++) {
// include data-column="all" external filters
col = indx === c.columns ? 'all' : indx;
filters[indx] = $filters.filter('[data-column="' + col + '"]').attr(wo.filter_defaultAttrib) || filters[indx] || '';
} }
} }
c.$table.data('lastSearch', filters); c.$table.data('lastSearch', filters);

4
dist/js/jquery.tablesorter.widgets.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -4,7 +4,7 @@
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▀▀ ▀▀▀▀██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▀▀ ▀▀▀▀██
█████▀ ▀████▀ ██ ██ ▀████▀ ██ ██ ██ ██ ▀████▀ █████▀ ██ ██ █████▀ █████▀ ▀████▀ ██ ██ ▀████▀ ██ ██ ██ ██ ▀████▀ █████▀ ██ ██ █████▀
*/ */
/*! tablesorter (FORK) widgets - updated 02-25-2015 (v2.20.1)*/ /*! tablesorter (FORK) widgets - updated 02-26-2015 (v2.20.1)*/
/* Includes: storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort */ /* Includes: storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort */
/*! Widget: storage */ /*! Widget: storage */
;(function ($, window, document) { ;(function ($, window, document) {
@ -807,7 +807,7 @@ ts.filter = {
}, },
setDefaults: function(table, c, wo) { setDefaults: function(table, c, wo) {
var isArray, saved, indx, var isArray, saved, indx, col, $filters,
// get current (default) filters // get current (default) filters
filters = ts.getFilters(table) || []; filters = ts.getFilters(table) || [];
if (wo.filter_saveFilters && ts.storage) { if (wo.filter_saveFilters && ts.storage) {
@ -818,8 +818,12 @@ ts.filter = {
} }
// if no filters saved, then check default settings // if no filters saved, then check default settings
if (filters.join('') === '') { if (filters.join('') === '') {
for (indx = 0; indx < c.columns; indx++) { // allow adding default setting to external filters
filters[indx] = c.$headers.filter('[data-column="' + indx + '"]:last').attr(wo.filter_defaultAttrib) || filters[indx]; $filters = c.$headers.add( wo.filter_$externalFilters ).filter('[' + wo.filter_defaultAttrib + ']');
for (indx = 0; indx <= c.columns; indx++) {
// include data-column="all" external filters
col = indx === c.columns ? 'all' : indx;
filters[indx] = $filters.filter('[data-column="' + col + '"]').attr(wo.filter_defaultAttrib) || filters[indx] || '';
} }
} }
c.$table.data('lastSearch', filters); c.$table.data('lastSearch', filters);

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

@ -458,7 +458,7 @@ ts.filter = {
}, },
setDefaults: function(table, c, wo) { setDefaults: function(table, c, wo) {
var isArray, saved, indx, var isArray, saved, indx, col, $filters,
// get current (default) filters // get current (default) filters
filters = ts.getFilters(table) || []; filters = ts.getFilters(table) || [];
if (wo.filter_saveFilters && ts.storage) { if (wo.filter_saveFilters && ts.storage) {
@ -469,8 +469,12 @@ ts.filter = {
} }
// if no filters saved, then check default settings // if no filters saved, then check default settings
if (filters.join('') === '') { if (filters.join('') === '') {
for (indx = 0; indx < c.columns; indx++) { // allow adding default setting to external filters
filters[indx] = c.$headers.filter('[data-column="' + indx + '"]:last').attr(wo.filter_defaultAttrib) || filters[indx]; $filters = c.$headers.add( wo.filter_$externalFilters ).filter('[' + wo.filter_defaultAttrib + ']');
for (indx = 0; indx <= c.columns; indx++) {
// include data-column="all" external filters
col = indx === c.columns ? 'all' : indx;
filters[indx] = $filters.filter('[data-column="' + col + '"]').attr(wo.filter_defaultAttrib) || filters[indx] || '';
} }
} }
c.$table.data('lastSearch', filters); c.$table.data('lastSearch', filters);