Skip to content

Commit

Permalink
Upgrade jQuery tablesorter plugin to v2 (#1666)
Browse files Browse the repository at this point in the history
* Support flat config and table_id as a group. Add docs

* upgrade jquery tablesorter plugin

* update changelog

* csp

* Revert "Support flat config and table_id as a group. Add docs"

This reverts commit 53e016c.

* Changelog

* Revert "Changelog"

This reverts commit 61c8d48.

---------

Co-authored-by: vladsaveliev <vladislav.savelyev@populationgenomics.org.au>
  • Loading branch information
jchorl and vladsavelyev committed Nov 21, 2023
1 parent 199245c commit fff441a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@

### MultiQC updates

- `table_columns_visible` and `table_columns_name`: support flat config and `table_id` as a group ([#2191](https://github.com/ewels/MultiQC/pull/2191))
- Fix the `"square": True` flag to scatter plot to actually make the plot square ([#2189](https://github.com/ewels/MultiQC/pull/2189))
- Config `table_columns_visible` and `table_columns_name`: support flat config and `table_id` as a group ([#2191](https://github.com/ewels/MultiQC/pull/2191))
- Upgrade the jQuery tablesorter plugin to v2

### New Modules

Expand Down
3 changes: 2 additions & 1 deletion CSP.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@

script-src 'self'
# 1.19
'sha256-dtGH1XcAyKopMui5x20KnPxuGuSx9Rs6piJB/4Oqu6I=' # jquery.tablesorter.min.js
'sha256-/C57+E7g4T7gJpkhM4cBNKuHqniEVV8thOcQDOUy640=' # multiqc/templates/default/assets/js/multiqc_plotting.js

# 1.18
'sha256-aY1YMeLr1IxkwxjBe0x60QzbuT4u5Mh/QC6brcAN9Do=' # multiqc/templates/default/assets/js/multiqc_tables.js

Expand Down
10 changes: 5 additions & 5 deletions multiqc/templates/default/assets/css/default_multiqc.css
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ input.form-control[type="color"] {
.mqc_table thead td {
background-color: #ffffff;
}
.mqc_table thead th:after {
.mqc_table thead th .tablesorter-header-inner:after {
content: "";
display: inline-block;
width: 0;
Expand All @@ -715,14 +715,14 @@ input.form-control[type="color"] {
border-right: 4px solid transparent;
border-left: 4px solid transparent;
}
.mqc_table thead th.headerSortDown:after {
.mqc_table thead th.tablesorter-headerAsc .tablesorter-header-inner:after {
border-bottom: 4px dashed;
}
.mqc_table thead th.headerSortUp:after {
.mqc_table thead th.tablesorter-headerDesc .tablesorter-header-inner:after {
border-top: 4px dashed;
}
.mqc_table thead th.headerSortDown,
.mqc_table thead th.headerSortUp {
.mqc_table thead th.tablesorter-headerAsc,
.mqc_table thead th.tablesorter-headerDesc {
background-color: #ededed;
color: #1ca8dd;
border-bottom: 2px solid #1ca8dd;
Expand Down

Large diffs are not rendered by default.

0 comments on commit fff441a

Please sign in to comment.