From: Victor Porton <porton@narod.ru>
Date: Sat, 20 Aug 2016 20:13:27 +0000 (+0300)
Subject: jquery.makeCollapsible: Support for .mw-collapsible-toggle inside <li>
X-Git-Tag: 1.31.0-rc.0~5976^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=251f1c3abf016ecde965864d0dd113e2d2a61af1;p=lhc%2Fweb%2Fwiklou.git

jquery.makeCollapsible: Support for .mw-collapsible-toggle inside <li>

Bug: T143484
Change-Id: Ib3480f543399c206e6ee7fc47ad7b22b9c2446b5
---

diff --git a/resources/src/jquery/jquery.makeCollapsible.js b/resources/src/jquery/jquery.makeCollapsible.js
index 501e898ebd..1edb9f2e5d 100644
--- a/resources/src/jquery/jquery.makeCollapsible.js
+++ b/resources/src/jquery/jquery.makeCollapsible.js
@@ -347,7 +347,8 @@
 					}
 
 				} else if ( $collapsible.parent().is( 'li' ) &&
-					$collapsible.parent().children( '.mw-collapsible' ).size() === 1
+					$collapsible.parent().children( '.mw-collapsible' ).size() === 1 &&
+					$collapsible.find( '> .mw-collapsible-toggle' ).size() === 0
 				) {
 					// special case of one collapsible in <li> tag
 					$toggleLink = buildDefaultToggleLink();