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

Filter: target last used filter issue. See #920

Browse Source
This commit is contained in:
Mottie 2015-05-31 10:45:50 -05:00
parent 261808d2ac
commit 18a97ed4d9
8 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/js/jquery.tablesorter.combined.js vendored
View File

@ -1,4 +1,4 @@
/*! tablesorter (FORK) - updated 05-29-2015 (v2.22.1)*/
/*! tablesorter (FORK) - updated 05-31-2015 (v2.22.1)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {
@ -3368,7 +3368,7 @@ ts.filter = {
return $( b ).attr( 'data-lastSearchTime' ) - $( a ).attr( 'data-lastSearchTime' );
});
}
return $();
return $input || $();
},
multipleColumns: function( c, $input ) {
// look for multiple columns '1-3,4-6,8' in data-column
@ -4051,8 +4051,8 @@ ts.getFilters = function( table, getRaw, setFilters, skipFirst ) {
$column = ts.filter.getLatestSearch( $column );
if ( $.isArray( setFilters ) ) {
// skip first ( latest input ) to maintain cursor position while typing
if ( skipFirst ) {
$column.slice( 1 );
if ( skipFirst && $column.length > 1 ) {
$column = $column.slice( 1 );
}
if ( i === c.columns ) {
// prevent data-column='all' from filling data-column='0,1' ( etc )

6
dist/js/jquery.tablesorter.combined.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
/*! tablesorter (FORK) - updated 05-29-2015 (v2.22.1)*/
/*! tablesorter (FORK) - updated 05-31-2015 (v2.22.1)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {
@ -1193,7 +1193,7 @@ ts.filter = {
return $( b ).attr( 'data-lastSearchTime' ) - $( a ).attr( 'data-lastSearchTime' );
});
}
return $();
return $input || $();
},
multipleColumns: function( c, $input ) {
// look for multiple columns '1-3,4-6,8' in data-column
@ -1876,8 +1876,8 @@ ts.getFilters = function( table, getRaw, setFilters, skipFirst ) {
$column = ts.filter.getLatestSearch( $column );
if ( $.isArray( setFilters ) ) {
// skip first ( latest input ) to maintain cursor position while typing
if ( skipFirst ) {
$column.slice( 1 );
if ( skipFirst && $column.length > 1 ) {
$column = $column.slice( 1 );
}
if ( i === c.columns ) {
// prevent data-column='all' from filling data-column='0,1' ( etc )

6
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

8
js/jquery.tablesorter.combined.js
View File

@ -4,7 +4,7 @@
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▀▀ ▀▀▀▀██
█████▀ ▀████▀ ██ ██ ▀████▀ ██ ██ ██ ██ ▀████▀ █████▀ ██ ██ █████▀
*/
/*! tablesorter (FORK) - updated 05-29-2015 (v2.22.1)*/
/*! tablesorter (FORK) - updated 05-31-2015 (v2.22.1)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {
@ -3374,7 +3374,7 @@ ts.filter = {
return $( b ).attr( 'data-lastSearchTime' ) - $( a ).attr( 'data-lastSearchTime' );
});
}
return $();
return $input || $();
},
multipleColumns: function( c, $input ) {
// look for multiple columns '1-3,4-6,8' in data-column
@ -4057,8 +4057,8 @@ ts.getFilters = function( table, getRaw, setFilters, skipFirst ) {
$column = ts.filter.getLatestSearch( $column );
if ( $.isArray( setFilters ) ) {
// skip first ( latest input ) to maintain cursor position while typing
if ( skipFirst ) {
$column.slice( 1 );
if ( skipFirst && $column.length > 1 ) {
$column = $column.slice( 1 );
}
if ( i === c.columns ) {
// prevent data-column='all' from filling data-column='0,1' ( etc )

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

@ -4,7 +4,7 @@
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▀▀ ▀▀▀▀██
█████▀ ▀████▀ ██ ██ ▀████▀ ██ ██ ██ ██ ▀████▀ █████▀ ██ ██ █████▀
*/
/*! tablesorter (FORK) - updated 05-29-2015 (v2.22.1)*/
/*! tablesorter (FORK) - updated 05-31-2015 (v2.22.1)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {
@ -1199,7 +1199,7 @@ ts.filter = {
return $( b ).attr( 'data-lastSearchTime' ) - $( a ).attr( 'data-lastSearchTime' );
});
}
return $();
return $input || $();
},
multipleColumns: function( c, $input ) {
// look for multiple columns '1-3,4-6,8' in data-column
@ -1882,8 +1882,8 @@ ts.getFilters = function( table, getRaw, setFilters, skipFirst ) {
$column = ts.filter.getLatestSearch( $column );
if ( $.isArray( setFilters ) ) {
// skip first ( latest input ) to maintain cursor position while typing
if ( skipFirst ) {
$column.slice( 1 );
if ( skipFirst && $column.length > 1 ) {
$column = $column.slice( 1 );
}
if ( i === c.columns ) {
// prevent data-column='all' from filling data-column='0,1' ( etc )

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

@ -826,7 +826,7 @@ ts.filter = {
return $( b ).attr( 'data-lastSearchTime' ) - $( a ).attr( 'data-lastSearchTime' );
});
}
return $();
return $input || $();
},
multipleColumns: function( c, $input ) {
// look for multiple columns '1-3,4-6,8' in data-column
@ -1509,8 +1509,8 @@ ts.getFilters = function( table, getRaw, setFilters, skipFirst ) {
$column = ts.filter.getLatestSearch( $column );
if ( $.isArray( setFilters ) ) {
// skip first ( latest input ) to maintain cursor position while typing
if ( skipFirst ) {
$column.slice( 1 );
if ( skipFirst && $column.length > 1 ) {
$column = $column.slice( 1 );
}
if ( i === c.columns ) {
// prevent data-column='all' from filling data-column='0,1' ( etc )