From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Wed, 18 Apr 2018 20:02:49 +0000 (+0200)
Subject: jquery.makeCollapsible: Only add '[' ']' to autogenerated toggles
X-Git-Tag: 1.31.0-rc.0~27
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/%22%24mplink/%40%20%27info_classement_2%27%20=%3E%20%27%C3%82%C2%A0out%20of%20%40liste%40%27%2C%20%27info_code_acces%27%20=%3E%20%27Do%20not%20forget%20your%20own%20access%20codes%21%27%2C%20%27info_compatibilite_html%27%20=%3E%20%27HTML%20norm%20to%20apply%27%2C-%27info_compresseur_gzip%27%20=%3E%20%27It%20is%20advisable%20to%20check%20first%20whether%20your%20hosting%20provider%20already%20systematically%20compresses%20PHP%20scripts.%20To%20do%20this%20you%20can%20use%20a%20service%20such%20as%20%40testgzip%40%27%2C-%27info_compresseur_texte%27%20=%3E%20%27If%20your%20server%20does%20not%20compress%20HTML%20pages%20before%20sending%20them%2C%20you%20can%20attempt%20to%20force%20compression%20in%20order%20to%20reduce%20the%20size%20of%20the%20pages%20transmitted.%3Cb%3EWarning%3C/b%3E:%20this%20can%20have%20a%20noticeable%20adverse%20effect%20on%20the%20performance%20of%20some%20servers%2C%20%27%2C%20%27info_config_suivi%27%20=%3E%20%27If%20this%20address%20corresponds%20to%20a%20mailing%20list%2C%20you%20can%20indicate%20the%20subscription%20address%20for%20this%20list.%20This%20may%20be%20a%20URL%20%28e.g.%20a%20webpage%20enabling%20subscription%20online%29%2C%20or%20an%20email%20address%20with%20a%20specific%20subject%20%28for%20instance:%20%3Ctt%3E%40adresse_suivi%40?a=commitdiff_plain;h=c012dd28af5fdf92e3ab914eae3ec462f5a201d8;p=lhc%2Fweb%2Fwiklou.git

jquery.makeCollapsible: Only add '[' ']' to autogenerated toggles

These should not be added if a pre-generated toggle was provided in
page HTML.

Follow-up to 46a7aa7e3e8ea98b69ae4bd0aff51465da57bcd3.

Bug: T192140
Change-Id: I4b7a7091c1db3559a474de94f8286c0df0af8a67
(cherry picked from commit 0b593253ba57b84c7c0a7688aa889d50cbad85eb)
---

diff --git a/resources/src/jquery/jquery.makeCollapsible.css b/resources/src/jquery/jquery.makeCollapsible.css
index 693cd7f9b3..6364c70743 100644
--- a/resources/src/jquery/jquery.makeCollapsible.css
+++ b/resources/src/jquery/jquery.makeCollapsible.css
@@ -6,10 +6,10 @@
 	-ms-user-select: none;
 	user-select: none;
 }
-.mw-collapsible-toggle:before {
+.mw-collapsible-toggle-default:before {
 	content: '[';
 }
-.mw-collapsible-toggle:after {
+.mw-collapsible-toggle-default:after {
 	content: ']';
 }
 /* Align the toggle based on the direction of the content language */
diff --git a/resources/src/jquery/jquery.makeCollapsible.js b/resources/src/jquery/jquery.makeCollapsible.js
index 7826baba0f..1f40e0a2b7 100644
--- a/resources/src/jquery/jquery.makeCollapsible.js
+++ b/resources/src/jquery/jquery.makeCollapsible.js
@@ -263,7 +263,7 @@
 			buildDefaultToggleLink = function () {
 				return $( '<a class="mw-collapsible-text"></a>' )
 					.text( collapseText )
-					.wrap( '<span class="mw-collapsible-toggle"></span>' )
+					.wrap( '<span class="mw-collapsible-toggle mw-collapsible-toggle-default"></span>' )
 					.parent()
 					.attr( {
 						role: 'button',