Skip to content

Commit 61da698

Browse files
themilkmanthemilkman
committed
Update tablesorter to latest version (2.29.3)
1 parent 7166fec commit 61da698

File tree

9 files changed

+67
-59
lines changed

9 files changed

+67
-59
lines changed

‎CHANGELOG.md

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

4+
#### v1.24.2 (2018-01-11)
5+
6+
* Upgrade tablesorter to v2.29.3
7+
48
#### v1.24.1 (2017-12-15)
59

610
* Upgrade tablesorter to v2.29.2

‎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.2 (12/13/2017) [documentation]
7+
Current tablesorter version: 2.29.3 (2018-01-10) [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 = 1
4+
TINY = 2
55

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

‎tablesorter

Submodule tablesorter updated 23 files

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▀▀ ▀▀▀██
55
█████▀ ▀████▀ ██ ██ ▀████▀ ██ ██ ██ ██ ▀████▀ █████▀ ██ ██ █████▀
66
*/
7-
/*! tablesorter (FORK) - updated 12-13-2017 (v2.29.2)*/
7+
/*! tablesorter (FORK) - updated 01-10-2018 (v2.29.3)*/
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.2 *//*
19+
/*! TableSorter (FORK) v2.29.3 *//*
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.2',
43+
version : '2.29.3',
4444

4545
parsers : [],
4646
widgets : [],
@@ -1164,7 +1164,7 @@
11641164
if ( $sorted.length ) {
11651165
for ( column = 0; column < $sorted.length; column++ ) {
11661166
if ( !$sorted[ column ].sortDisabled ) {
1167-
updateColumnSort( $sorted.eq( column ) , list[ indx ][ 1 ] );
1167+
updateColumnSort( $sorted.eq( column ), list[ indx ][ 1 ] );
11681168
}
11691169
}
11701170
}

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

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

2727
parsers : [],
2828
widgets : [],
@@ -1146,7 +1146,7 @@
11461146
if ( $sorted.length ) {
11471147
for ( column = 0; column < $sorted.length; column++ ) {
11481148
if ( !$sorted[ column ].sortDisabled ) {
1149-
updateColumnSort( $sorted.eq( column ) , list[ indx ][ 1 ] );
1149+
updateColumnSort( $sorted.eq( column ), list[ indx ][ 1 ] );
11501150
}
11511151
}
11521152
}

‎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 12-13-2017 (v2.29.2)*/
7+
/*! tablesorter (FORK) - updated 01-10-2018 (v2.29.3)*/
88
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
99
(function(factory) {
1010
if (typeof define === 'function' && define.amd) {

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

+19-14
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! Parser: network - updated 5/17/2015 (v2.22.0) */
1+
/*! Parser: network - updated 2018-01-10 (v2.29.3) */
22
/* IPv4, IPv6 and MAC Addresses */
33
/*global jQuery: false */
44
;(function($){
@@ -23,6 +23,10 @@
2323
ipv6Validate : /^\s*((([0-9a-f]{1,4}:){7}([0-9a-f]{1,4}|:))|(([0-9a-f]{1,4}:){6}(:[0-9a-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){5}(((:[0-9a-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){4}(((:[0-9a-f]{1,4}){1,3})|((:[0-9a-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){3}(((:[0-9a-f]{1,4}){1,4})|((:[0-9a-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){2}(((:[0-9a-f]{1,4}){1,5})|((:[0-9a-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){1}(((:[0-9a-f]{1,4}){1,6})|((:[0-9a-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9a-f]{1,4}){1,7})|((:[0-9a-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/i
2424
});
2525

26+
// used for internal testing; it's not useful to set this to true because the natural sort algorithm
27+
// is set up to only sort solitary hex values ("ffff") vs separated hex values ("ffff.ffff")
28+
ts.defaults.ipv6HexFormat = false;
29+
2630
ts.addParser({
2731
id: 'ipv6Address',
2832
is: function(s) {
@@ -72,25 +76,26 @@
7276
('00000' + (parseInt(groups[i], 16) || 0)).slice(-5);
7377
expandedAddress += ( i != validGroupCount - 1) ? groups[i] + ':' : groups[i];
7478
}
75-
return hex ? expandedAddress : expandedAddress.replace(/:/g, '');
79+
return expandedAddress;
7680
},
7781
// uses natural sort hex compare
78-
type: 'numeric'
82+
type: 'text'
7983
});
8084

8185
// ipv4 address
8286
// moved here from jquery.tablesorter.js (core file)
8387
ipv4Is = function(s) {
8488
return (/^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/).test(s);
8589
};
86-
ipv4Format = function(s, table) {
87-
var i, a = s ? s.split('.') : '',
88-
r = '',
90+
ipv4Format = function(s) {
91+
var i,
92+
a = s ? s.split('.') : '',
93+
r = [],
8994
l = a.length;
9095
for (i = 0; i < l; i++) {
91-
r += ('000' + a[i]).slice(-3);
96+
r.push(('000' + a[i]).slice(-3));
9297
}
93-
return s ? ts.formatFloat(r, table) : s;
98+
return s ? r.join('.') : s;
9499
};
95100

96101
/*! Parser: ipv4Address (a.k.a. ipAddress) */
@@ -99,13 +104,13 @@
99104
id: 'ipAddress',
100105
is: ipv4Is,
101106
format: ipv4Format,
102-
type: 'numeric'
107+
type: 'text'
103108
});
104109
ts.addParser({
105110
id: 'ipv4Address',
106111
is: ipv4Is,
107112
format: ipv4Format,
108-
type: 'numeric'
113+
type: 'text'
109114
});
110115

111116
/*! Parser: MAC address */
@@ -118,21 +123,21 @@
118123
},
119124
format : function( str ) {
120125
var indx, len,
121-
mac = '',
126+
mac = [],
122127
val = ( str || '' ).replace( /[:.-]/g, '' ).match( /\w{2}/g );
123128
if ( val ) {
124129
// not assuming all mac addresses in the column will end up with six
125130
// groups of two to process, so it's not actually validating the address
126131
len = val.length;
127132
for ( indx = 0; indx < len; indx++ ) {
128-
mac += ( '000' + parseInt( val[ indx ], 16 ) ).slice( -3 );
133+
mac.push(( '000' + parseInt( val[ indx ], 16 ) ).slice( -3 ));
129134
}
130-
return mac;
135+
return mac.join('.');
131136
}
132137
return str;
133138
},
134139
// uses natural sort hex compare
135-
type : 'numeric'
140+
type : 'text'
136141
});
137142

138143
})( jQuery );

‎vendor/assets/stylesheets/jquery-tablesorter/theme.bootstrap_4.css

+33-34
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
cursor: pointer;
2121
white-space: normal;
2222
}
23-
.tablesorter-bootstrap:not(.table-inverse) thead:not(.thead-inverse) .tablesorter-header,
24-
.tablesorter-bootstrap:not(.table-inverse) tfoot th,
25-
.tablesorter-bootstrap:not(.table-inverse) tfoot td {
23+
.tablesorter-bootstrap:not(.table-dark) thead:not(.thead-dark) .tablesorter-header,
24+
.tablesorter-bootstrap:not(.table-dark) tfoot th,
25+
.tablesorter-bootstrap:not(.table-dark) tfoot td {
2626
background-color: #eee;
2727
}
2828

@@ -51,33 +51,33 @@
5151
}
5252

5353
/* white icons */
54-
.tablesorter-bootstrap thead.thead-inverse .tablesorter-headerUnSorted:not(.sorter-false),
55-
.tablesorter-bootstrap.table-inverse thead .tablesorter-headerUnSorted:not(.sorter-false) {
54+
.tablesorter-bootstrap thead.thead-dark .tablesorter-headerUnSorted:not(.sorter-false),
55+
.tablesorter-bootstrap.table-dark thead .tablesorter-headerUnSorted:not(.sorter-false) {
5656
background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDE0IDIwIj48cGF0aCBmaWxsPSIjZmZmIiBkPSJNMTQgMTNsLTIuNS0yLjVMNyAxNWwtNC41LTQuNUwwIDEzbDcgN3pNMTQgNy41TDExLjUgMTAgNyA1LjUgMi41IDEwIDAgNy41bDctN3oiLz48L3N2Zz4=);
5757
}
58-
.tablesorter-bootstrap thead.thead-inverse .tablesorter-headerAsc,
59-
.tablesorter-bootstrap.table-inverse thead .tablesorter-headerAsc {
58+
.tablesorter-bootstrap thead.thead-dark .tablesorter-headerAsc,
59+
.tablesorter-bootstrap.table-dark thead .tablesorter-headerAsc {
6060
background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMiIgaGVpZ2h0PSIxMiIgdmlld0JveD0iMCAwIDE0IDE0Ij48cGF0aCBmaWxsPSIjZmZmIiBkPSJNMTQgOS41TDExLjUgMTIgNyA3LjUgMi41IDEyIDAgOS41bDctN3oiLz48L3N2Zz4=);
6161
}
62-
.tablesorter-bootstrap thead.thead-inverse .tablesorter-headerDesc,
63-
.tablesorter-bootstrap.table-inverse thead .tablesorter-headerDesc {
62+
.tablesorter-bootstrap thead.thead-dark .tablesorter-headerDesc,
63+
.tablesorter-bootstrap.table-dark thead .tablesorter-headerDesc {
6464
background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMiIgaGVpZ2h0PSIxMiIgdmlld0JveD0iMCAwIDE0IDE0Ij48cGF0aCBmaWxsPSIjZmZmIiBkPSJNMTQgNWwtMi41LTIuNS00LjUgNC41LTQuNS00LjVMMCA1IDcgMTJ6Ii8+PC9zdmc+);
6565
}
6666

6767
/* since bootstrap (table-striped) uses nth-child(), we just use this to add a zebra stripe color */
68-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr.odd > td,
69-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr.tablesorter-hasChildRow.odd:hover ~ tr.tablesorter-hasChildRow.odd ~ .tablesorter-childRow.odd > td {
68+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr.odd > td,
69+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr.tablesorter-hasChildRow.odd:hover ~ tr.tablesorter-hasChildRow.odd ~ .tablesorter-childRow.odd > td {
7070
background-color: #f9f9f9;
7171
}
72-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr.hover > td,
73-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr.odd:hover > td,
74-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr.even:hover > td,
75-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr.tablesorter-hasChildRow.odd:hover ~ .tablesorter-childRow.odd > td,
76-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr.tablesorter-hasChildRow.even:hover ~ .tablesorter-childRow.even > td {
72+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr.hover > td,
73+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr.odd:hover > td,
74+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr.even:hover > td,
75+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr.tablesorter-hasChildRow.odd:hover ~ .tablesorter-childRow.odd > td,
76+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr.tablesorter-hasChildRow.even:hover ~ .tablesorter-childRow.even > td {
7777
background-color: #f5f5f5;
7878
}
79-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr.even > td,
80-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr.tablesorter-hasChildRow.even:hover ~ tr.tablesorter-hasChildRow.even ~ .tablesorter-childRow.even > td {
79+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr.even > td,
80+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr.tablesorter-hasChildRow.even:hover ~ tr.tablesorter-hasChildRow.even ~ .tablesorter-childRow.even > td {
8181
background-color: #fff;
8282
}
8383

@@ -89,30 +89,30 @@
8989
}
9090

9191
/* Column Widget - column sort colors */
92-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr.odd td.primary {
92+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr.odd td.primary {
9393
background-color: #bfbfbf;
9494
}
95-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr td.primary,
96-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr.even td.primary {
95+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr td.primary,
96+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr.even td.primary {
9797
background-color: #d9d9d9;
9898
}
99-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr.odd td.secondary {
99+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr.odd td.secondary {
100100
background-color: #d9d9d9;
101101
}
102-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr td.secondary,
103-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr.even td.secondary {
102+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr td.secondary,
103+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr.even td.secondary {
104104
background-color: #e6e6e6;
105105
}
106-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr.odd td.tertiary {
106+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr.odd td.tertiary {
107107
background-color: #e6e6e6;
108108
}
109-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr td.tertiary,
110-
.tablesorter-bootstrap:not(.table-inverse) > tbody > tr.even td.tertiary {
109+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr td.tertiary,
110+
.tablesorter-bootstrap:not(.table-dark) > tbody > tr.even td.tertiary {
111111
background-color: #f2f2f2;
112112
}
113113

114114
/* caption */
115-
.tablesorter-bootstrap:not(.table-inverse) .caption {
115+
.tablesorter-bootstrap:not(.table-dark) .caption {
116116
background-color: #fff;
117117
}
118118

@@ -129,11 +129,11 @@
129129
-o-transition: height 0.1s ease;
130130
transition: height 0.1s ease;
131131
}
132-
.tablesorter-bootstrap:not(.table-inverse) .tablesorter-filter-row {
132+
.tablesorter-bootstrap:not(.table-dark) .tablesorter-filter-row {
133133
background-color: #efefef;
134134
}
135-
.tablesorter-bootstrap:not(.table-inverse) .tablesorter-filter-row input.tablesorter-filter,
136-
.tablesorter-bootstrap:not(.table-inverse) .tablesorter-filter-row select.tablesorter-filter {
135+
.tablesorter-bootstrap:not(.table-dark) .tablesorter-filter-row input.tablesorter-filter,
136+
.tablesorter-bootstrap:not(.table-dark) .tablesorter-filter-row select.tablesorter-filter {
137137
color: #333;
138138
}
139139

@@ -144,7 +144,7 @@
144144
transition: height 0.1s ease;
145145
}
146146

147-
.tablesorter-bootstrap:not(.table-inverse) .tablesorter-filter-row td {
147+
.tablesorter-bootstrap:not(.table-dark) .tablesorter-filter-row td {
148148
line-height: normal;
149149
text-align: center;
150150
padding: 4px 6px;
@@ -176,13 +176,12 @@
176176
}
177177

178178
/* pager plugin */
179-
180179
.tablesorter-bootstrap .tablesorter-pager .pagedisplay {
181180
border: 0;
182181
}
183182

184183
/* ajax error row */
185-
.tablesorter:not(.table-inverse) .tablesorter-errorRow td {
184+
.tablesorter:not(.table-dark) .tablesorter-errorRow td {
186185
text-align: center;
187186
cursor: pointer;
188187
background-color: #e6bf99;

0 commit comments

Comments
 (0)