Skip to content

Commit f310614

Browse files
themilkmanthemilkman
committed
Update tablesorter to latest version (2.29.5)
1 parent e166247 commit f310614

10 files changed

+74
-42
lines changed

‎CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
Changelog
22
===
33

4-
#### v1.24.3 (2018-01-11)
4+
#### v1.24.4 (2018-01-31)
5+
6+
* Upgrade tablesorter to v2.29.5
7+
8+
#### v1.24.3 (2018-01-19)
59

610
* Upgrade tablesorter to v2.29.4
711

‎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.29.4 (2018-01-18) [documentation]
7+
Current tablesorter version: 2.29.5 (2018-01-30) [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 = 24
4-
TINY = 3
4+
TINY = 4
55

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

‎tablesorter

Submodule tablesorter updated 22 files

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

+18-13
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▀▀ ▀▀▀██
55
█████▀ ▀████▀ ██ ██ ▀████▀ ██ ██ ██ ██ ▀████▀ █████▀ ██ ██ █████▀
66
*/
7-
/*! tablesorter (FORK) - updated 2018-01-18 (v2.29.4)*/
7+
/*! tablesorter (FORK) - updated 2018-01-30 (v2.29.5)*/
88
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
99
(function(factory) {
1010
if (typeof define === 'function' && define.amd) {
@@ -16,7 +16,7 @@
1616
}
1717
}(function(jQuery) {
1818

19-
/*! TableSorter (FORK) v2.29.4 *//*
19+
/*! TableSorter (FORK) v2.29.5 *//*
2020
* Client-side table sorting with ease!
2121
* @requires jQuery v1.2.6+
2222
*
@@ -40,7 +40,7 @@
4040
'use strict';
4141
var ts = $.tablesorter = {
4242

43-
version : '2.29.4',
43+
version : '2.29.5',
4444

4545
parsers : [],
4646
widgets : [],
@@ -3288,7 +3288,7 @@
32883288

32893289
})(jQuery);
32903290

3291-
/*! Widget: filter - updated 12/13/2017 (v2.29.1) *//*
3291+
/*! Widget: filter - updated 2018-01-30 (v2.29.5) *//*
32923292
* Requires tablesorter v2.8+ and jQuery 1.7+
32933293
* by Rob Garrison
32943294
*/
@@ -3657,7 +3657,12 @@
36573657

36583658
var options, string, txt, $header, column, val, fxn, noSelect,
36593659
c = table.config,
3660-
wo = c.widgetOptions;
3660+
wo = c.widgetOptions,
3661+
processStr = function(prefix, str, suffix) {
3662+
str = str.trim();
3663+
// don't include prefix/suffix if str is empty
3664+
return str === '' ? '' : (prefix || '') + str + (suffix || '');
3665+
};
36613666
c.$table.addClass( 'hasFilters' );
36623667
c.lastSearch = [];
36633668

@@ -3673,13 +3678,13 @@
36733678
$.extend( tsfRegex, {
36743679
child : new RegExp( c.cssChildRow ),
36753680
filtered : new RegExp( wo.filter_filteredRow ),
3676-
alreadyFiltered : new RegExp( '(\\s+(' + ts.language.or + '|-|' + ts.language.to + ')\\s+)', 'i' ),
3677-
toTest : new RegExp( '\\s+(-|' + ts.language.to + ')\\s+', 'i' ),
3678-
toSplit : new RegExp( '(?:\\s+(?:-|' + ts.language.to + ')\\s+)', 'gi' ),
3679-
andTest : new RegExp( '\\s+(' + ts.language.and + '|&&)\\s+', 'i' ),
3680-
andSplit : new RegExp( '(?:\\s+(?:' + ts.language.and + '|&&)\\s+)', 'gi' ),
3681-
orTest : new RegExp( '(\\||\\s+' + ts.language.or + '\\s+)', 'i' ),
3682-
orSplit : new RegExp( '(?:\\s+(?:' + ts.language.or + ')\\s+|\\|)', 'gi' ),
3681+
alreadyFiltered : new RegExp( '(\\s+(-' + processStr('|', ts.language.or) + processStr('|', ts.language.to) + ')\\s+)', 'i' ),
3682+
toTest : new RegExp( '\\s+(-' + processStr('|', ts.language.to) + ')\\s+', 'i' ),
3683+
toSplit : new RegExp( '(?:\\s+(?:-' + processStr('|', ts.language.to) + ')\\s+)', 'gi' ),
3684+
andTest : new RegExp( '\\s+(' + processStr('', ts.language.and, '|') + '&&)\\s+', 'i' ),
3685+
andSplit : new RegExp( '(?:\\s+(?:' + processStr('', ts.language.and, '|') + '&&)\\s+)', 'gi' ),
3686+
orTest : new RegExp( '(\\|' + processStr('|\\s+', ts.language.or, '\\s+') + ')', 'i' ),
3687+
orSplit : new RegExp( '(?:\\|' + processStr('|\\s+(?:', ts.language.or, ')\\s+') + ')', 'gi' ),
36833688
iQuery : new RegExp( val, 'i' ),
36843689
igQuery : new RegExp( val, 'ig' ),
36853690
operTest : /^[<>]=?/,
@@ -4060,7 +4065,7 @@
40604065
name = wo.filter_filterLabel;
40614066
tmp = name.match(/{{([^}]+?)}}/g);
40624067
if (!tmp) {
4063-
tmp = ['{{label}}'];
4068+
tmp = [ '{{label}}' ];
40644069
}
40654070
$.each(tmp, function(indx, attr) {
40664071
var regex = new RegExp(attr, 'g'),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! TableSorter (FORK) v2.29.4 *//*
1+
/*! TableSorter (FORK) v2.29.5 *//*
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.29.4',
25+
version : '2.29.5',
2626

2727
parsers : [],
2828
widgets : [],

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

+16-11
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▀▀ ▀▀▀██
55
█████▀ ▀████▀ ██ ██ ▀████▀ ██ ██ ██ ██ ▀████▀ █████▀ ██ ██ █████▀
66
*/
7-
/*! tablesorter (FORK) - updated 2018-01-18 (v2.29.4)*/
7+
/*! tablesorter (FORK) - updated 2018-01-30 (v2.29.5)*/
88
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
99
(function(factory) {
1010
if (typeof define === 'function' && define.amd) {
@@ -408,7 +408,7 @@
408408

409409
})(jQuery);
410410

411-
/*! Widget: filter - updated 12/13/2017 (v2.29.1) *//*
411+
/*! Widget: filter - updated 2018-01-30 (v2.29.5) *//*
412412
* Requires tablesorter v2.8+ and jQuery 1.7+
413413
* by Rob Garrison
414414
*/
@@ -777,7 +777,12 @@
777777

778778
var options, string, txt, $header, column, val, fxn, noSelect,
779779
c = table.config,
780-
wo = c.widgetOptions;
780+
wo = c.widgetOptions,
781+
processStr = function(prefix, str, suffix) {
782+
str = str.trim();
783+
// don't include prefix/suffix if str is empty
784+
return str === '' ? '' : (prefix || '') + str + (suffix || '');
785+
};
781786
c.$table.addClass( 'hasFilters' );
782787
c.lastSearch = [];
783788

@@ -793,13 +798,13 @@
793798
$.extend( tsfRegex, {
794799
child : new RegExp( c.cssChildRow ),
795800
filtered : new RegExp( wo.filter_filteredRow ),
796-
alreadyFiltered : new RegExp( '(\\s+(' + ts.language.or + '|-|' + ts.language.to + ')\\s+)', 'i' ),
797-
toTest : new RegExp( '\\s+(-|' + ts.language.to + ')\\s+', 'i' ),
798-
toSplit : new RegExp( '(?:\\s+(?:-|' + ts.language.to + ')\\s+)', 'gi' ),
799-
andTest : new RegExp( '\\s+(' + ts.language.and + '|&&)\\s+', 'i' ),
800-
andSplit : new RegExp( '(?:\\s+(?:' + ts.language.and + '|&&)\\s+)', 'gi' ),
801-
orTest : new RegExp( '(\\||\\s+' + ts.language.or + '\\s+)', 'i' ),
802-
orSplit : new RegExp( '(?:\\s+(?:' + ts.language.or + ')\\s+|\\|)', 'gi' ),
801+
alreadyFiltered : new RegExp( '(\\s+(-' + processStr('|', ts.language.or) + processStr('|', ts.language.to) + ')\\s+)', 'i' ),
802+
toTest : new RegExp( '\\s+(-' + processStr('|', ts.language.to) + ')\\s+', 'i' ),
803+
toSplit : new RegExp( '(?:\\s+(?:-' + processStr('|', ts.language.to) + ')\\s+)', 'gi' ),
804+
andTest : new RegExp( '\\s+(' + processStr('', ts.language.and, '|') + '&&)\\s+', 'i' ),
805+
andSplit : new RegExp( '(?:\\s+(?:' + processStr('', ts.language.and, '|') + '&&)\\s+)', 'gi' ),
806+
orTest : new RegExp( '(\\|' + processStr('|\\s+', ts.language.or, '\\s+') + ')', 'i' ),
807+
orSplit : new RegExp( '(?:\\|' + processStr('|\\s+(?:', ts.language.or, ')\\s+') + ')', 'gi' ),
803808
iQuery : new RegExp( val, 'i' ),
804809
igQuery : new RegExp( val, 'ig' ),
805810
operTest : /^[<>]=?/,
@@ -1180,7 +1185,7 @@
11801185
name = wo.filter_filterLabel;
11811186
tmp = name.match(/{{([^}]+?)}}/g);
11821187
if (!tmp) {
1183-
tmp = ['{{label}}'];
1188+
tmp = [ '{{label}}' ];
11841189
}
11851190
$.each(tmp, function(indx, attr) {
11861191
var regex = new RegExp(attr, 'g'),

‎vendor/assets/javascripts/jquery-tablesorter/parsers/parser-input-select.js

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! Parser: input & select - updated 5/16/2017 (v2.28.10) *//*
1+
/*! Parser: input & select - updated 2018-01-30 (v2.29.5) *//*
22
* for jQuery 1.7+ & tablesorter 2.7.11+
33
* Demo: http://mottie.github.com/tablesorter/docs/example-widget-grouping.html
44
*/
@@ -66,6 +66,19 @@
6666
type : 'text'
6767
});
6868

69+
$.tablesorter.addParser({
70+
id: 'radio',
71+
is: function() {
72+
return false;
73+
},
74+
format: function(txt, table, cell) {
75+
var $input = $(cell).find('input:checked');
76+
return $input.length ? $input.val() : txt;
77+
},
78+
parsed: true,
79+
type: 'text'
80+
});
81+
6982
// Custom parser which returns the currently selected options
7083
// updated dynamically using the 'change' function below
7184
$.tablesorter.addParser({

‎vendor/assets/javascripts/jquery-tablesorter/widgets/widget-filter-formatter-select2.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! Widget: filter, select2 formatter function - updated 7/11/2016 (v2.26.6) *//*
1+
/*! Widget: filter, select2 formatter function - updated 1/18/2018 (v2.29.4) *//*
22
* requires: jQuery 1.7.2+, tableSorter (FORK) 2.16+, filter widget 2.16+
33
and select2 v3.4.6+ plugin (this code is NOT compatible with select2 v4+)
44
*/

‎vendor/assets/javascripts/jquery-tablesorter/widgets/widget-filter.js

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! Widget: filter - updated 12/13/2017 (v2.29.1) *//*
1+
/*! Widget: filter - updated 2018-01-30 (v2.29.5) *//*
22
* Requires tablesorter v2.8+ and jQuery 1.7+
33
* by Rob Garrison
44
*/
@@ -367,7 +367,12 @@
367367

368368
var options, string, txt, $header, column, val, fxn, noSelect,
369369
c = table.config,
370-
wo = c.widgetOptions;
370+
wo = c.widgetOptions,
371+
processStr = function(prefix, str, suffix) {
372+
str = str.trim();
373+
// don't include prefix/suffix if str is empty
374+
return str === '' ? '' : (prefix || '') + str + (suffix || '');
375+
};
371376
c.$table.addClass( 'hasFilters' );
372377
c.lastSearch = [];
373378

@@ -383,13 +388,13 @@
383388
$.extend( tsfRegex, {
384389
child : new RegExp( c.cssChildRow ),
385390
filtered : new RegExp( wo.filter_filteredRow ),
386-
alreadyFiltered : new RegExp( '(\\s+(' + ts.language.or + '|-|' + ts.language.to + ')\\s+)', 'i' ),
387-
toTest : new RegExp( '\\s+(-|' + ts.language.to + ')\\s+', 'i' ),
388-
toSplit : new RegExp( '(?:\\s+(?:-|' + ts.language.to + ')\\s+)', 'gi' ),
389-
andTest : new RegExp( '\\s+(' + ts.language.and + '|&&)\\s+', 'i' ),
390-
andSplit : new RegExp( '(?:\\s+(?:' + ts.language.and + '|&&)\\s+)', 'gi' ),
391-
orTest : new RegExp( '(\\||\\s+' + ts.language.or + '\\s+)', 'i' ),
392-
orSplit : new RegExp( '(?:\\s+(?:' + ts.language.or + ')\\s+|\\|)', 'gi' ),
391+
alreadyFiltered : new RegExp( '(\\s+(-' + processStr('|', ts.language.or) + processStr('|', ts.language.to) + ')\\s+)', 'i' ),
392+
toTest : new RegExp( '\\s+(-' + processStr('|', ts.language.to) + ')\\s+', 'i' ),
393+
toSplit : new RegExp( '(?:\\s+(?:-' + processStr('|', ts.language.to) + ')\\s+)', 'gi' ),
394+
andTest : new RegExp( '\\s+(' + processStr('', ts.language.and, '|') + '&&)\\s+', 'i' ),
395+
andSplit : new RegExp( '(?:\\s+(?:' + processStr('', ts.language.and, '|') + '&&)\\s+)', 'gi' ),
396+
orTest : new RegExp( '(\\|' + processStr('|\\s+', ts.language.or, '\\s+') + ')', 'i' ),
397+
orSplit : new RegExp( '(?:\\|' + processStr('|\\s+(?:', ts.language.or, ')\\s+') + ')', 'gi' ),
393398
iQuery : new RegExp( val, 'i' ),
394399
igQuery : new RegExp( val, 'ig' ),
395400
operTest : /^[<>]=?/,
@@ -770,7 +775,7 @@
770775
name = wo.filter_filterLabel;
771776
tmp = name.match(/{{([^}]+?)}}/g);
772777
if (!tmp) {
773-
tmp = ['{{label}}'];
778+
tmp = [ '{{label}}' ];
774779
}
775780
$.each(tmp, function(indx, attr) {
776781
var regex = new RegExp(attr, 'g'),

0 commit comments

Comments
 (0)