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

Merge branch 'master' into gh-pages

Browse Source
This commit is contained in:
Rob Garrison 2018-05-16 18:54:34 -05:00
commit 6fd69767c3
14 changed files with 54 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
README.md
View File

@ -104,14 +104,23 @@ If you would like to contribute, please...
View the [complete change log here](https://github.com/Mottie/tablesorter/wiki/Changes).
#### <a name="v2.30.3">Version 2.30.3</a> (2018-03-30)
#### <a name="v2.30.4">Version 2.30.4</a> (2018-05-16)
* Core:
* Use table cell, not jQuery object to disable sort; Fixes issue introduced in v2.30.2.
* Scroller:
* Set scrollLeft position after sort. Fixes [issue #1545](https://github.com/Mottie/tablesorter/issues/1545).
* Docs:
* Add when not to use headers. See [issue #1524](https://github.com/Mottie/tablesorter/issues/1524).
#### <a name="v2.30.3">Version 2.30.3</a> (2018-04-30)
* Core:
* Use indexed headers. Fixes [issue #1524](https://github.com/Mottie/tablesorter/issues/1524).
* Docs:
* Remove link preload because it isn't supported in Firefox.
#### <a name="v2.30.2">Version 2.30.2</a> (2018-03-26)
#### <a name="v2.30.2">Version 2.30.2</a> (2018-04-26)
* Core:
* Allow passing headers from multiple rows. See [issue #1116](https://github.com/Mottie/tablesorter/issues/1116).
@ -132,29 +141,3 @@ View the [complete change log here](https://github.com/Mottie/tablesorter/wiki/C
* Replace whitespace with symbols.
* Meta:
* Update dependencies.
#### <a name="v2.30.1">Version 2.30.1</a> (2018-03-19)
* Core:
* Only validate options while debugging. Closes [issue #1528](https://github.com/Mottie/tablesorter/issues/1528)
* Pager:
* Show all rows, not pages. Fixes [issue #1529](https://github.com/Mottie/tablesorter/issues/1529)
* SaveSort:
* Fix JS error. See [issue #1525](https://github.com/Mottie/tablesorter/issues/1525)
#### <a name="v2.30.0">Version 2.30.0</a> (2018-03-18)
* Core:
* [Debug](https://mottie.github.io/tablesorter/docs/#debug) now allows you to debug components separately; set to `true` as usual, or set to `'core filter'` to only show the core and filter widget debug logs.
* Change pager `removeRows` check. Fixes issues [#1525](https://github.com/Mottie/tablesorter/issues/1525) &amp; [#1466](https://github.com/Mottie/tablesorter/issues/1466).
* Filter:
* Make `onlyAvail` work with showProcessing. Fixes [issue #1518](https://github.com/Mottie/tablesorter/issues/1518).
* Escape quotes in select options. See [issue #1527](https://github.com/Mottie/tablesorter/issues/1527).
* Pager:
* Change pager `removeRows` check. Fixes issues [#1525](https://github.com/Mottie/tablesorter/issues/1525) &amp; [#1466](https://github.com/Mottie/tablesorter/issues/1466).
* Global:
* Add editor eslint &amp; fix issues. File versions were not updated for this change!
* Docs:
* Update Bootstrap v4.0.0.
* Adjust (accordion) link position.
* Fix scroller fixed column border alignment.

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

@ -1,4 +1,4 @@
/*! tablesorter (FORK) - updated 2018-04-30 (v2.30.3)*/
/*! tablesorter (FORK) - updated 2018-05-16 (v2.30.4)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {
@ -10,7 +10,7 @@
}
}(function(jQuery) {
/*! TableSorter (FORK) v2.30.3 *//*
/*! TableSorter (FORK) v2.30.4 *//*
* Client-side table sorting with ease!
* @requires jQuery v1.2.6+
*
@ -34,7 +34,7 @@
'use strict';
var ts = $.tablesorter = {
version : '2.30.3',
version : '2.30.4',
parsers : [],
widgets : [],
@ -532,7 +532,7 @@
$cell = ts.getClosest( $( this ), '.' + ts.css.header );
// use column index from data-attribute or index of current row; fixes #1116
c.last.clickedIndex = $cell.attr( 'data-column' ) || $cell.index();
cell = c.$headerIndexed[ c.last.clickedIndex ];
cell = c.$headerIndexed[ c.last.clickedIndex ][0];
if ( cell && !cell.sortDisabled ) {
ts.initSort( c, cell, e );
}

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

File diff suppressed because one or more lines are too long

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

@ -8,7 +8,7 @@
}
}(function(jQuery) {
/*! TableSorter (FORK) v2.30.3 *//*
/*! TableSorter (FORK) v2.30.4 *//*
* Client-side table sorting with ease!
* @requires jQuery v1.2.6+
*
@ -32,7 +32,7 @@
'use strict';
var ts = $.tablesorter = {
version : '2.30.3',
version : '2.30.4',
parsers : [],
widgets : [],
@ -530,7 +530,7 @@
$cell = ts.getClosest( $( this ), '.' + ts.css.header );
// use column index from data-attribute or index of current row; fixes #1116
c.last.clickedIndex = $cell.attr( 'data-column' ) || $cell.index();
cell = c.$headerIndexed[ c.last.clickedIndex ];
cell = c.$headerIndexed[ c.last.clickedIndex ][0];
if ( cell && !cell.sortDisabled ) {
ts.initSort( c, cell, e );
}

2
dist/js/jquery.tablesorter.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
/*! tablesorter (FORK) - updated 2018-04-30 (v2.30.3)*/
/*! tablesorter (FORK) - updated 2018-05-16 (v2.30.4)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {

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

File diff suppressed because one or more lines are too long

4
dist/js/widgets/widget-scroller.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 2018-04-30 (v2.30.3)*/
/*! tablesorter (FORK) - updated 2018-05-16 (v2.30.4)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {
@ -16,7 +16,7 @@
}
}(function(jQuery) {
/*! TableSorter (FORK) v2.30.3 *//*
/*! TableSorter (FORK) v2.30.4 *//*
* Client-side table sorting with ease!
* @requires jQuery v1.2.6+
*
@ -40,7 +40,7 @@
'use strict';
var ts = $.tablesorter = {
version : '2.30.3',
version : '2.30.4',
parsers : [],
widgets : [],
@ -538,7 +538,7 @@
$cell = ts.getClosest( $( this ), '.' + ts.css.header );
// use column index from data-attribute or index of current row; fixes #1116
c.last.clickedIndex = $cell.attr( 'data-column' ) || $cell.index();
cell = c.$headerIndexed[ c.last.clickedIndex ];
cell = c.$headerIndexed[ c.last.clickedIndex ][0];
if ( cell && !cell.sortDisabled ) {
ts.initSort( c, cell, e );
}

6
js/jquery.tablesorter.js
View File

@ -1,4 +1,4 @@
/*! TableSorter (FORK) v2.30.3 *//*
/*! TableSorter (FORK) v2.30.4 *//*
* Client-side table sorting with ease!
* @requires jQuery v1.2.6+
*
@ -22,7 +22,7 @@
'use strict';
var ts = $.tablesorter = {
version : '2.30.3',
version : '2.30.4',
parsers : [],
widgets : [],
@ -520,7 +520,7 @@
$cell = ts.getClosest( $( this ), '.' + ts.css.header );
// use column index from data-attribute or index of current row; fixes #1116
c.last.clickedIndex = $cell.attr( 'data-column' ) || $cell.index();
cell = c.$headerIndexed[ c.last.clickedIndex ];
cell = c.$headerIndexed[ c.last.clickedIndex ][0];
if ( cell && !cell.sortDisabled ) {
ts.initSort( c, cell, e );
}

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

@ -4,7 +4,7 @@
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▀▀ ▀▀▀██
█████▀ ▀████▀ ██ ██ ▀████▀ ██ ██ ██ ██ ▀████▀ █████▀ ██ ██ █████▀
*/
/*! tablesorter (FORK) - updated 2018-04-30 (v2.30.3)*/
/*! tablesorter (FORK) - updated 2018-05-16 (v2.30.4)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {

26
js/widgets/widget-scroller.js
View File

@ -1,4 +1,4 @@
/*! Widget: scroller - updated 2018-02-25 (v2.29.6) *//*
/*! Widget: scroller - updated 2018-05-07 (v2.30.4) *//*
Copyright (C) 2011 T. Connell & Associates, Inc.
Dual-licensed under the MIT and GPL licenses
@ -203,6 +203,7 @@
wo.scroller_calcWidths = [];
wo.scroller_saved = [ 0, 0 ];
wo.scroller_isBusy = true;
wo.scroller_scrollTimer = null;
// set scrollbar width to one of the following (1) explicitly set scroller_barWidth option,
// (2) detected scrollbar width or (3) fallback of 15px
@ -273,8 +274,11 @@
.off( 'scroll' + namespace )
.on( 'scroll' + namespace, function() {
// Save position
wo.scroller_saved[0] = $tableWrap.scrollLeft();
wo.scroller_saved[1] = $tableWrap.scrollTop();
clearTimeout(wo.scroller_scrollTimer);
wo.scroller_scrollTimer = setTimeout(function() {
wo.scroller_saved[0] = $tableWrap.scrollLeft();
wo.scroller_saved[1] = $tableWrap.scrollTop();
}, 300);
if ( wo.scroller_jumpToHeader ) {
var pos = $win.scrollTop() - $hdr.offset().top;
if ( $( this ).scrollTop() !== 0 && pos < tbHt && pos > 0 ) {
@ -295,12 +299,18 @@
$table
.off( namespace )
.on( 'sortStart' + namespace, function() {
clearTimeout(wo.scroller_scrollTimer);
wo.scroller_isBusy = true;
})
.on( 'sortEnd filterEnd'.split( ' ' ).join( namespace + ' ' ), function( event ) {
// Sorting, so scroll to top
if ( event.type === 'sortEnd' && wo.scroller_upAfterSort ) {
$tableWrap.animate({
scrollTop : 0
}, 'fast' );
$tableWrap
.scrollLeft( wo.scroller_saved[0] )
.animate({ scrollTop : 0 }, 'fast', function() {
wo.scroller_isBusy = false;
});
} else if ( wo.scroller_fixedColumns ) {
setTimeout( function() {
// restore previous scroll position
@ -859,7 +869,9 @@
$fixedColumn.find('caption').height( wo.scroller_$header.find( 'caption' ).height() );
$tableWrap.scroll();
wo.scroller_isBusy = false;
setTimeout(function() {
wo.scroller_isBusy = false;
}, 0)
},

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "tablesorter",
"title": "tablesorter",
"version": "2.30.3",
"version": "2.30.4",
"description": "tablesorter (FORK) is a jQuery plugin for turning a standard HTML table with THEAD and TBODY tags into a sortable table without page refreshes. tablesorter can successfully parse and sort many types of data including linked data in a cell.",
"author": {
"name": "Christian Bach",

2
tablesorter.jquery.json
View File

@ -1,7 +1,7 @@
{
"name": "tablesorter",
"title": "tablesorter",
"version": "2.30.3",
"version": "2.30.4",
"description": "tablesorter is a jQuery plugin for turning a standard HTML table with THEAD and TBODY tags into a sortable table without page refreshes. tablesorter can successfully parse and sort many types of data including linked data in a cell.\n\nThis forked version adds lots of new enhancements including: alphanumeric sorting, pager callback functons, multiple widgets providing column styling, ui theme application, sticky headers, column filters and resizer, as well as extended documentation with a lot more demos.",
"author": {
"name": "Christian Bach",