From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 22 May 2019 17:11:17 +0000 (+0000)
Subject: Merge "jquery.tablesorter: Fix pre-JS selector to match wikitext-generated sortable... 
X-Git-Tag: 1.34.0-rc.0~1631
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=447574ceb746c2f4026a8bf77632bdc4604314bb

Merge "jquery.tablesorter: Fix pre-JS selector to match wikitext-generated sortable tables"
---

447574ceb746c2f4026a8bf77632bdc4604314bb
diff --cc resources/src/jquery.tablesorter.styles/jquery.tablesorter.styles.less
index 7ff7c11a9c,589ae23502..b926454a61
--- a/resources/src/jquery.tablesorter.styles/jquery.tablesorter.styles.less
+++ b/resources/src/jquery.tablesorter.styles/jquery.tablesorter.styles.less
@@@ -1,10 -1,14 +1,16 @@@
  @import 'mediawiki.mixins';
  
 +/* stylelint-disable selector-class-pattern */
 +
  /* Table Sorting */
  
- .client-js .sortable:not( .jquery-tablesorter ) > thead > :last-of-type > th:not( .unsortable ),
+ // Reserve space for table sortable controls
+ // This selector is not perfect as it will not correctly handle cases with
+ // merged header cells, so ensure it is removed after the JS has run by using
+ // the :not( .jquery-tablesorter ) selector.
+ // It will still prevent a visible jump in the majority of simpler cases.
+ // The second selector in this rule is for after the JS has run.
+ .client-js .sortable:not( .jquery-tablesorter ) > * > tr:first-child > th:not( .unsortable ),
  .jquery-tablesorter th.headerSort {
  	.background-image-svg( 'images/sort_both.svg', 'images/sort_both.png' );
  	cursor: pointer;