From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Mon, 8 Feb 2016 12:57:47 +0000 (+0000)
Subject: Revert "TableSorter: Avoid FOUC and preserve styling in VisualEditor"
X-Git-Tag: 1.31.0-rc.0~8059^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/rappels.php?a=commitdiff_plain;h=cbe1910f8719fd01ca902810ae9ab73b1256549a;p=lhc%2Fweb%2Fwiklou.git

Revert "TableSorter: Avoid FOUC and preserve styling in VisualEditor"

That was, unfortunately, way too optimistic. The logic for
choosing header cells that are used for sorting is a lot more
complicated than current CSS selectors can express.

This reverts commit 9e363d0e8a12f4fc205de08958622d6e8e250c81.

Bug: T126007
Change-Id: I7c08e06a4f61d69b6858958218d9a6233aee18de
---

diff --git a/resources/src/jquery/jquery.tablesorter.less b/resources/src/jquery/jquery.tablesorter.less
index 85c58d745c..f4ef540954 100644
--- a/resources/src/jquery/jquery.tablesorter.less
+++ b/resources/src/jquery/jquery.tablesorter.less
@@ -1,20 +1,19 @@
 @import "mediawiki.mixins";
 
-// Table Sorting
+/* Table Sorting */
 
-.client-js table.jquery-tablesorter th.headerSort {
+table.jquery-tablesorter th.headerSort {
 	.background-image-svg( 'images/sort_both.svg', 'images/sort_both.png' );
 	cursor: pointer;
-	// Keep synchronized with mediawiki.skinning.content styles
 	background-repeat: no-repeat;
 	background-position: center right;
 	padding-right: 21px;
 }
 
-.client-js table.jquery-tablesorter th.headerSortUp {
+table.jquery-tablesorter th.headerSortUp {
 	.background-image-svg( 'images/sort_up.svg', 'images/sort_up.png' );
 }
 
-.client-js table.jquery-tablesorter th.headerSortDown {
+table.jquery-tablesorter th.headerSortDown {
 	.background-image-svg( 'images/sort_down.svg', 'images/sort_down.png' );
 }
diff --git a/resources/src/mediawiki.skinning/content.css b/resources/src/mediawiki.skinning/content.css
index a873cdfae4..c88d00dd8b 100644
--- a/resources/src/mediawiki.skinning/content.css
+++ b/resources/src/mediawiki.skinning/content.css
@@ -241,16 +241,3 @@ div.tright {
 div.tleft {
 	margin: .5em 1.4em 1.3em 0;
 }
-
-/* Make space for the jquery.tablesorter icon and display a placeholder if JavaScript is loaded, while
-   tablesorter is still loading and setting up the tables for sorting. This avoids a flash of
-   unstyled content during page load (FOUC). The styles can also be used by WYSIWYG editors. */
-.client-js table.sortable th:not(.unsortable) {
-	background-image: url(images/sort_both_readonly.png);
-	/* @embed */
-	background-image: linear-gradient(transparent, transparent), url(images/sort_both_readonly.svg);
-	/* Keep synchronised with jquery.tablesorter styles */
-	background-repeat: no-repeat;
-	background-position: center right;
-	padding-right: 21px;
-}
diff --git a/resources/src/mediawiki.skinning/images/sort_both_readonly.png b/resources/src/mediawiki.skinning/images/sort_both_readonly.png
deleted file mode 100644
index bdb09e3d52..0000000000
Binary files a/resources/src/mediawiki.skinning/images/sort_both_readonly.png and /dev/null differ
diff --git a/resources/src/mediawiki.skinning/images/sort_both_readonly.svg b/resources/src/mediawiki.skinning/images/sort_both_readonly.svg
deleted file mode 100644
index 3b97000cf5..0000000000
--- a/resources/src/mediawiki.skinning/images/sort_both_readonly.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 9" height="9" width="21">
-    <path d="M14.5 5l-4 4-4-4zM14.5 4l-4-4-4 4z" style="fill-opacity: 0.5;"/>
-</svg>