Skip to content

Commit 67715c5

Browse files
committed
Update tablesorter to latest version (2.31.1)
1 parent 5dcb4ee commit 67715c5

File tree

8 files changed

+25
-11
lines changed

8 files changed

+25
-11
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Changelog
22
===
33

4+
#### v1.26.1 (2018-11-22)
5+
6+
* Upgrade tablesorter to v2.31.1
7+
48
#### v1.26.0 (2018-09-03)
59

610
* Upgrade tablesorter to v2.31.0

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Simple integration of jQuery tablesorter ([Mottie's fork]) into the asset pipeline.
66

7-
Current tablesorter version: 2.31.0 (2018-08-27) [documentation]
7+
Current tablesorter version: 2.31.1 (2018-11-20) [documentation]
88

99
Any issue associated with the js/css files, please report to [Mottie's fork].
1010

lib/jquery-tablesorter/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module JqueryTablesorter
22
MAJOR = 1
33
MINOR = 26
4-
TINY = 0
4+
TINY = 1
55

66
VERSION = [MAJOR, MINOR, TINY].compact.join('.')
77
end

vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.combined.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▀▀ ▀▀▀██
55
█████▀ ▀████▀ ██ ██ ▀████▀ ██ ██ ██ ██ ▀████▀ █████▀ ██ ██ █████▀
66
*/
7-
/*! tablesorter (FORK) - updated 2018-08-27 (v2.31.0)*/
7+
/*! tablesorter (FORK) - updated 2018-11-20 (v2.31.1)*/
88
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
99
(function(factory){if (typeof define === 'function' && define.amd){define(['jquery'], factory);} else if (typeof module === 'object' && typeof module.exports === 'object'){module.exports = factory(require('jquery'));} else {factory(jQuery);}}(function(jQuery) {
10-
/*! TableSorter (FORK) v2.31.0 *//*
10+
/*! TableSorter (FORK) v2.31.1 *//*
1111
* Client-side table sorting with ease!
1212
* @requires jQuery v1.2.6+
1313
*
@@ -31,7 +31,7 @@
3131
'use strict';
3232
var ts = $.tablesorter = {
3333

34-
version : '2.31.0',
34+
version : '2.31.1',
3535

3636
parsers : [],
3737
widgets : [],
@@ -328,6 +328,8 @@
328328
ts.applyWidget( table, true );
329329
// if user has supplied a sort list to constructor
330330
if ( c.sortList.length > 0 ) {
331+
// save sortList before any sortAppend is added
332+
c.last.sortList = c.sortList;
331333
ts.sortOn( c, c.sortList, {}, !c.initWidgets );
332334
} else {
333335
ts.setHeadersCss( c );

vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! TableSorter (FORK) v2.31.0 *//*
1+
/*! TableSorter (FORK) v2.31.1 *//*
22
* Client-side table sorting with ease!
33
* @requires jQuery v1.2.6+
44
*
@@ -22,7 +22,7 @@
2222
'use strict';
2323
var ts = $.tablesorter = {
2424

25-
version : '2.31.0',
25+
version : '2.31.1',
2626

2727
parsers : [],
2828
widgets : [],
@@ -319,6 +319,8 @@
319319
ts.applyWidget( table, true );
320320
// if user has supplied a sort list to constructor
321321
if ( c.sortList.length > 0 ) {
322+
// save sortList before any sortAppend is added
323+
c.last.sortList = c.sortList;
322324
ts.sortOn( c, c.sortList, {}, !c.initWidgets );
323325
} else {
324326
ts.setHeadersCss( c );

vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.widgets.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▀▀ ▀▀▀██
55
█████▀ ▀████▀ ██ ██ ▀████▀ ██ ██ ██ ██ ▀████▀ █████▀ ██ ██ █████▀
66
*/
7-
/*! tablesorter (FORK) - updated 2018-08-27 (v2.31.0)*/
7+
/*! tablesorter (FORK) - updated 2018-11-20 (v2.31.1)*/
88
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
99
(function(factory){if (typeof define === 'function' && define.amd){define(['jquery'], factory);} else if (typeof module === 'object' && typeof module.exports === 'object'){module.exports = factory(require('jquery'));} else {factory(jQuery);}}(function(jQuery) {
1010
/*! Widget: storage - updated 2018-03-18 (v2.30.0) */

vendor/assets/javascripts/jquery-tablesorter/widgets/widget-math.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! Widget: math - updated 5/3/2017 (v2.28.9) *//*
1+
/*! Widget: math - updated 11/20/2018 (v2.31.1) *//*
22
* Requires tablesorter v2.16+ and jQuery 1.7+
33
* by Rob Garrison
44
*/
@@ -28,10 +28,14 @@
2828
events : ( 'tablesorter-initialized update updateAll updateRows addRows updateCell filterReset ' )
2929
.split(' ').join('.tsmath '),
3030

31-
processText : function( c, $cell ) {
31+
processText : function( c, $cell ) {
3232
var tmp,
33+
wo = c.widgetOptions,
3334
txt = ts.getElementText( c, $cell, math.getCellIndex( $cell ) ),
3435
prefix = c.widgetOptions.math_prefix;
36+
if (wo.math_textAttr) {
37+
txt = $cell.attr(wo.math_textAttr) || txt;
38+
}
3539
if ( /</.test( prefix ) ) {
3640
// prefix contains HTML; remove it & any text before using formatFloat
3741
tmp = $( '<div>' + prefix + '</div>' ).text()
@@ -612,6 +616,8 @@
612616
// e.g. '<span class="red">{content}</span>'
613617
math_prefix : '',
614618
math_suffix : '',
619+
// cell attribute containing the math value to use
620+
math_textAttr : '',
615621
// no matching math elements found (text added to cell)
616622
math_none : 'N/A',
617623
math_event : 'recalculate',

0 commit comments

Comments
 (0)