Skip to content

Commit db53fbf

Browse files
themilkmanthemilkman
committed
Fix 2.28.14 instead of 2.28.15 asset data
1 parent 6f01d0f commit db53fbf

11 files changed

+138
-98
lines changed

‎CHANGELOG.md

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

4+
#### v1.23.15 (2017-07-09)
5+
6+
* Hotfix for adding v2.28.14 instead of v2.28.15 asset data in previous release
7+
48
#### v1.23.14 (2017-07-09)
59

610
* Upgrade tablesorter to v2.28.15

‎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 = 23
4-
TINY = 14
4+
TINY = 15
55

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

‎tablesorter

Submodule tablesorter updated 28 files

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

+13-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▀▀ ▀▀▀██
55
█████▀ ▀████▀ ██ ██ ▀████▀ ██ ██ ██ ██ ▀████▀ █████▀ ██ ██ █████▀
66
*/
7-
/*! tablesorter (FORK) - updated 06-08-2017 (v2.28.14)*/
7+
/*! tablesorter (FORK) - updated 07-04-2017 (v2.28.15)*/
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.28.14 *//*
19+
/*! TableSorter (FORK) v2.28.15 *//*
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.28.14',
43+
version : '2.28.15',
4444

4545
parsers : [],
4646
widgets : [],
@@ -2258,7 +2258,7 @@
22582258
cells = $rows[ i ].cells;
22592259
for ( j = 0; j < cells.length; j++ ) {
22602260
cell = cells[ j ];
2261-
rowIndex = cell.parentNode.rowIndex;
2261+
rowIndex = i;
22622262
rowSpan = cell.rowSpan || 1;
22632263
colSpan = cell.colSpan || 1;
22642264
if ( typeof matrix[ rowIndex ] === 'undefined' ) {
@@ -2317,7 +2317,7 @@
23172317
if ( !valid ) {
23182318
$rows.each( function( indx, el ) {
23192319
var cell = el.parentElement.nodeName;
2320-
if ( cells.indexOf( cell ) ) {
2320+
if ( cells.indexOf( cell ) < 0 ) {
23212321
cells.push( cell );
23222322
}
23232323
});
@@ -3274,7 +3274,7 @@
32743274

32753275
})(jQuery);
32763276

3277-
/*! Widget: filter - updated 5/24/2017 (v2.28.11) *//*
3277+
/*! Widget: filter - updated 7/4/2017 (v2.28.15) *//*
32783278
* Requires tablesorter v2.8+ and jQuery 1.7+
32793279
* by Rob Garrison
32803280
*/
@@ -3345,8 +3345,10 @@
33453345
var tbodyIndex, $tbody,
33463346
$table = c.$table,
33473347
$tbodies = c.$tbodies,
3348-
events = 'addRows updateCell update updateRows updateComplete appendCache filterReset filterAndSortReset filterEnd search '
3349-
.split( ' ' ).join( c.namespace + 'filter ' );
3348+
events = (
3349+
'addRows updateCell update updateRows updateComplete appendCache filterReset ' +
3350+
'filterAndSortReset filterFomatterUpdate filterEnd search stickyHeadersInit '
3351+
).split( ' ' ).join( c.namespace + 'filter ' );
33503352
$table
33513353
.removeClass( 'hasFilters' )
33523354
// add filter namespace to all BUT search
@@ -3875,7 +3877,9 @@
38753877
// so we have to work with it instead
38763878
formatterUpdated: function( $cell, column ) {
38773879
// prevent error if $cell is undefined - see #1056
3878-
var wo = $cell && $cell.closest( 'table' )[0].config.widgetOptions;
3880+
var $table = $cell && $cell.closest( 'table' );
3881+
var config = $table.length && $table[0].config,
3882+
wo = config && config.widgetOptions;
38793883
if ( wo && !wo.filter_initialized ) {
38803884
// add updates by column since this function
38813885
// may be called numerous times before initialization

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

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

2727
parsers : [],
2828
widgets : [],
@@ -2240,7 +2240,7 @@
22402240
cells = $rows[ i ].cells;
22412241
for ( j = 0; j < cells.length; j++ ) {
22422242
cell = cells[ j ];
2243-
rowIndex = cell.parentNode.rowIndex;
2243+
rowIndex = i;
22442244
rowSpan = cell.rowSpan || 1;
22452245
colSpan = cell.colSpan || 1;
22462246
if ( typeof matrix[ rowIndex ] === 'undefined' ) {
@@ -2299,7 +2299,7 @@
22992299
if ( !valid ) {
23002300
$rows.each( function( indx, el ) {
23012301
var cell = el.parentElement.nodeName;
2302-
if ( cells.indexOf( cell ) ) {
2302+
if ( cells.indexOf( cell ) < 0 ) {
23032303
cells.push( cell );
23042304
}
23052305
});

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

+9-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██▀▀ ▀▀▀██
55
█████▀ ▀████▀ ██ ██ ▀████▀ ██ ██ ██ ██ ▀████▀ █████▀ ██ ██ █████▀
66
*/
7-
/*! tablesorter (FORK) - updated 06-08-2017 (v2.28.14)*/
7+
/*! tablesorter (FORK) - updated 07-04-2017 (v2.28.15)*/
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 5/24/2017 (v2.28.11) *//*
411+
/*! Widget: filter - updated 7/4/2017 (v2.28.15) *//*
412412
* Requires tablesorter v2.8+ and jQuery 1.7+
413413
* by Rob Garrison
414414
*/
@@ -479,8 +479,10 @@
479479
var tbodyIndex, $tbody,
480480
$table = c.$table,
481481
$tbodies = c.$tbodies,
482-
events = 'addRows updateCell update updateRows updateComplete appendCache filterReset filterAndSortReset filterEnd search '
483-
.split( ' ' ).join( c.namespace + 'filter ' );
482+
events = (
483+
'addRows updateCell update updateRows updateComplete appendCache filterReset ' +
484+
'filterAndSortReset filterFomatterUpdate filterEnd search stickyHeadersInit '
485+
).split( ' ' ).join( c.namespace + 'filter ' );
484486
$table
485487
.removeClass( 'hasFilters' )
486488
// add filter namespace to all BUT search
@@ -1009,7 +1011,9 @@
10091011
// so we have to work with it instead
10101012
formatterUpdated: function( $cell, column ) {
10111013
// prevent error if $cell is undefined - see #1056
1012-
var wo = $cell && $cell.closest( 'table' )[0].config.widgetOptions;
1014+
var $table = $cell && $cell.closest( 'table' );
1015+
var config = $table.length && $table[0].config,
1016+
wo = config && config.widgetOptions;
10131017
if ( wo && !wo.filter_initialized ) {
10141018
// add updates by column since this function
10151019
// may be called numerous times before initialization

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

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Widget: columnSelector (responsive table widget) - updated 5/25/2017 (v2.28.12) *//*
1+
/* Widget: columnSelector (responsive table widget) - updated 7/4/2017 (v2.28.15) *//*
22
* Requires tablesorter v2.8+ and jQuery 1.7+
33
* by Justin Hallett & Rob Garrison
44
*/
@@ -547,6 +547,11 @@
547547
csel.$style.remove();
548548
csel.$breakpoints.remove();
549549
$( c.namespace + 'columnselectorHasSpan' ).removeClass( wo.filter_filteredRow || 'filtered' );
550+
c.$table.find('[data-col-span]').each(function(indx, el) {
551+
var $el = $(el);
552+
console.log($el, $el.attr('data-col-span'));
553+
$el.attr('colspan', $el.attr('data-col-span'));
554+
});
550555
c.$table.off('updateAll' + namespace + ' update' + namespace);
551556
}
552557

0 commit comments

Comments
 (0)