From 53b84c31fe6d633e165b55816125a6635ca55f75 Mon Sep 17 00:00:00 2001 From: Stephen Zeng Date: Wed, 12 Aug 2020 11:17:25 -0500 Subject: [PATCH] Grouping: Fixing self closing icon tags to support jQuery 3.5 --- dist/js/jquery.tablesorter.combined.js | 2 +- dist/js/jquery.tablesorter.js | 2 +- dist/js/widgets/widget-grouping.min.js | 2 +- docs/example-widget-align-character.html | 2 +- js/jquery.tablesorter.combined.js | 2 +- js/jquery.tablesorter.js | 2 +- js/widgets/widget-grouping.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dist/js/jquery.tablesorter.combined.js b/dist/js/jquery.tablesorter.combined.js index a1a5b71d..fc2c45fc 100644 --- a/dist/js/jquery.tablesorter.combined.js +++ b/dist/js/jquery.tablesorter.combined.js @@ -36,7 +36,7 @@ widthFixed : false, // adds colgroup to fix widths of columns showProcessing : false, // show an indeterminate timer icon in the header when the table is sorted or filtered. - headerTemplate : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = // class from cssIcon + headerTemplate : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = // class from cssIcon onRenderTemplate : null, // function( index, template ) { return template; }, // template is a string onRenderHeader : null, // function( index ) {}, // nothing to return diff --git a/dist/js/jquery.tablesorter.js b/dist/js/jquery.tablesorter.js index 0ecb1b4a..8c7248d8 100644 --- a/dist/js/jquery.tablesorter.js +++ b/dist/js/jquery.tablesorter.js @@ -34,7 +34,7 @@ widthFixed : false, // adds colgroup to fix widths of columns showProcessing : false, // show an indeterminate timer icon in the header when the table is sorted or filtered. - headerTemplate : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = // class from cssIcon + headerTemplate : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = // class from cssIcon onRenderTemplate : null, // function( index, template ) { return template; }, // template is a string onRenderHeader : null, // function( index ) {}, // nothing to return diff --git a/dist/js/widgets/widget-grouping.min.js b/dist/js/widgets/widget-grouping.min.js index 1d35852b..4ebd4a70 100644 --- a/dist/js/widgets/widget-grouping.min.js +++ b/dist/js/widgets/widget-grouping.min.js @@ -1,4 +1,4 @@ (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){ /*! Widget: grouping - updated 9/27/2017 (v2.29.0) */ -!function(i){"use strict";var l=i.tablesorter,g=l.grouping={types:{number:function(r,o,e,u){var p,t=o.hasClass(l.css.sortAsc);return 1/g,">");return''+(o.group_collapsible?"":"")+''+u+''},saveCurrentGrouping:function(r,o,e){var u,p,t=!1;return o.group_collapsible&&o.group_saveGroups&&(o.group_collapsedGroups=l.storage&&l.storage(r.table,"tablesorter-groups")||{},p="dir"+r.sortList[0][1],u=o.group_collapsedGroup=r.sortList[0][0]+p+e.grouping.join(""),o.group_collapsedGroups[u]?t=!0:o.group_collapsedGroups[u]=[]),t},findColumnGroups:function(r,o,e){var u,p,t,a,s=l.hasWidget(r.table,"pager"),n=r.pager||{};for(u=e.groupIndex=0;u/g,">");return''+(o.group_collapsible?"":"")+''+u+''},saveCurrentGrouping:function(r,o,e){var u,p,t=!1;return o.group_collapsible&&o.group_saveGroups&&(o.group_collapsedGroups=l.storage&&l.storage(r.table,"tablesorter-groups")||{},p="dir"+r.sortList[0][1],u=o.group_collapsedGroup=r.sortList[0][0]+p+e.grouping.join(""),o.group_collapsedGroups[u]?t=!0:o.group_collapsedGroups[u]=[]),t},findColumnGroups:function(r,o,e){var u,p,t,a,s=l.hasWidget(r.table,"pager"),n=r.pager||{};for(u=e.groupIndex=0;u', + alignChar_wrap : '', alignChar_charAttrib : 'data-align-char', alignChar_indexAttrib : 'data-align-index', alignChar_adjustAttrib : 'data-align-adjust' // percentage width adjustments diff --git a/js/jquery.tablesorter.combined.js b/js/jquery.tablesorter.combined.js index 6f910e15..02b9b595 100644 --- a/js/jquery.tablesorter.combined.js +++ b/js/jquery.tablesorter.combined.js @@ -42,7 +42,7 @@ widthFixed : false, // adds colgroup to fix widths of columns showProcessing : false, // show an indeterminate timer icon in the header when the table is sorted or filtered. - headerTemplate : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = // class from cssIcon + headerTemplate : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = // class from cssIcon onRenderTemplate : null, // function( index, template ) { return template; }, // template is a string onRenderHeader : null, // function( index ) {}, // nothing to return diff --git a/js/jquery.tablesorter.js b/js/jquery.tablesorter.js index fe1baaa7..1371e198 100644 --- a/js/jquery.tablesorter.js +++ b/js/jquery.tablesorter.js @@ -33,7 +33,7 @@ widthFixed : false, // adds colgroup to fix widths of columns showProcessing : false, // show an indeterminate timer icon in the header when the table is sorted or filtered. - headerTemplate : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = // class from cssIcon + headerTemplate : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = // class from cssIcon onRenderTemplate : null, // function( index, template ) { return template; }, // template is a string onRenderHeader : null, // function( index ) {}, // nothing to return diff --git a/js/widgets/widget-grouping.js b/js/widgets/widget-grouping.js index 17914194..ecfb7ca4 100644 --- a/js/widgets/widget-grouping.js +++ b/js/widgets/widget-grouping.js @@ -179,7 +179,7 @@ '" unselectable="on" ' + ( c.tabIndex ? 'tabindex="0" ' : '' ) + 'data-group-index="' + data.groupIndex + '">' + '' + - ( wo.group_collapsible ? '' : '' ) + + ( wo.group_collapsible ? '' : '' ) + '' + name + '' + '' + '';