Merge branch 'archwiki'

Conflicts:
	extensions/FluxBBAuthPlugin.php
	extensions/SyntaxHighlight_GeSHi/README
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.i18n.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
	extensions/SyntaxHighlight_GeSHi/geshi/docs/CHANGES
	extensions/SyntaxHighlight_GeSHi/geshi/docs/THANKS
	extensions/SyntaxHighlight_GeSHi/geshi/docs/TODO
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constant.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Destructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Function.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Global.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/I.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Index.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/L.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Method.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/T.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Variable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/blank.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/class_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/file.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/function_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/private_class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/up_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.html
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.txt
	extensions/SyntaxHighlight_GeSHi/geshi/geshi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/4cs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502acme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502kickass.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502tasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/68000devpac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/abap.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ada.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/algol68.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apache.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/applescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apt_sources.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoconf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autohotkey.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoit.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/avisynth.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/awk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bascomavr.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bash.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/basic4gl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bibtex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/blitzbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bnf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/boo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_loadrunner.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_mac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/caddcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cadlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfdg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/chaiscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cil.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/clojure.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cmake.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cobol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/coffeescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp-qt.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/csharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/css.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cuesheet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/d.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dcs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/delphi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/diff.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/div.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dos.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/e.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ecmascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/eiffel.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/email.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/epc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/erlang.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/euphoria.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/f1.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/falcon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fortran.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/freebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fsharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gambas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gdb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genero.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genie.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gettext.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/glsl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gnuplot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/go.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/groovy.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gwbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hicest.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hq9plus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html4strict.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/icon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/idl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ini.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/inno.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/intercal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/io.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/j.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/javascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/jquery.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/kixtart.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonecpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/latex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/llvm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/locobasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/logtalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lolcode.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusformulas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lsl2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lua.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/m68k.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/magiksf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/make.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mapbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/matlab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mirc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mmix.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mpasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mxml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mysql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/newlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/nsis.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oberon2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objeck.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oobas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle11.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle8.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oxygene.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oz.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pascal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pcre.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/per.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl6.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pic16.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pike.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pixelbender.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pli.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/plsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/postgresql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/povray.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powerbuilder.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powershell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/proftpd.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/progress.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/prolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/properties.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/providex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/purebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pycon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/python.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/q.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/qbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rails.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rebol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/reg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/robots.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rpmspec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rsplus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ruby.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scheme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scilab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sdlbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smalltalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smarty.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/systemverilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/teraterm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/text.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/thinbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/typoscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/unicon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/uscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vbnet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/verilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vhdl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vim.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualfoxpro.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualprolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whitespace.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whois.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/winbatch.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xorg_conf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/yaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/z80.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/zxbasic.php

1 files changed, 322 insertions, 282 deletions

diff --git a/resources/jquery/jquery.makeCollapsible.js b/resources/jquery/jquery.makeCollapsible.js
index 0a4d3645..0cd6417c 100644
--- a/resources/jquery/jquery.makeCollapsible.js
+++ b/resources/jquery/jquery.makeCollapsible.js
@@ -2,340 +2,380 @@
  * jQuery makeCollapsible
  *
  * This will enable collapsible-functionality on all passed elements.
- * Will prevent binding twice to the same element.
- * Initial state is expanded by default, this can be overriden by adding class
- * "mw-collapsed" to the "mw-collapsible" element.
- * Elements made collapsible have class "mw-made-collapsible".
- * Except for tables and lists, the inner content is wrapped in "mw-collapsible-content".
+ * - Will prevent binding twice to the same element.
+ * - Initial state is expanded by default, this can be overriden by adding class
+ *   "mw-collapsed" to the "mw-collapsible" element.
+ * - Elements made collapsible have jQuery data "mw-made-collapsible" set to true.
+ * - The inner content is wrapped in a "div.mw-collapsible-content" (except for tables and lists).
  *
- * @author Krinkle <krinklemail@gmail.com>
+ * @author Krinkle, 2011-2012
  *
  * Dual license:
  * @license CC-BY 3.0 <http://creativecommons.org/licenses/by/3.0>
  * @license GPL2 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>
  */
 ( function ( $, mw ) {
+	var lpx = 'jquery.makeCollapsible> ';
+
+	/**
+	 * Handler for a click on a collapsible toggler.
+	 *
+	 * @param {jQuery} $collapsible
+	 * @param {string} action The action this function will take ('expand' or 'collapse').
+	 * @param {jQuery|null} [optional] $defaultToggle
+	 * @param {Object|undefined} options
+	 */
+	function toggleElement( $collapsible, action, $defaultToggle, options ) {
+		var $collapsibleContent, $containers, hookCallback;
+		options = options || {};
+
+		// Validate parameters
+
+		// $collapsible must be an instance of jQuery
+		if ( !$collapsible.jquery ) {
+			return;
+		}
+		if ( action !== 'expand' && action !== 'collapse' ) {
+			// action must be string with 'expand' or 'collapse'
+			return;
+		}
+		if ( $defaultToggle === undefined ) {
+			$defaultToggle = null;
+		}
+		if ( $defaultToggle !== null && !$defaultToggle.jquery ) {
+			// is optional (may be undefined), but if defined it must be an instance of jQuery.
+			// If it's not, abort right away.
+			// After this $defaultToggle is either null or a valid jQuery instance.
+			return;
+		}
 
-$.fn.makeCollapsible = function () {
-
-	return this.each(function () {
-
-		// Define reused variables and functions
-		var $toggle,
-			lpx = 'jquery.makeCollapsible> ',
-			$that = $(this).addClass( 'mw-collapsible' ), // case: $( '#myAJAXelement' ).makeCollapsible()
-			that = this,
-			collapsetext = $(this).attr( 'data-collapsetext' ),
-			expandtext = $(this).attr( 'data-expandtext' ),
-			toggleElement = function ( $collapsible, action, $defaultToggle, instantHide ) {
-				var $collapsibleContent, $containers;
+		// Trigger a custom event to allow callers to hook to the collapsing/expanding,
+		// allowing the module to be testable, and making it possible to
+		// e.g. implement persistence via cookies
+		$collapsible.trigger( action === 'expand' ? 'beforeExpand.mw-collapsible' : 'beforeCollapse.mw-collapsible' );
+		hookCallback = function () {
+			$collapsible.trigger( action === 'expand' ? 'afterExpand.mw-collapsible' : 'afterCollapse.mw-collapsible' );
+		};
+
+		// Handle different kinds of elements
+
+		if ( !options.plainMode && $collapsible.is( 'table' ) ) {
+			// Tables
+			$containers = $collapsible.find( '> tbody > tr' );
+			if ( $defaultToggle ) {
+				// Exclude table row containing togglelink
+				$containers = $containers.not( $defaultToggle.closest( 'tr' ) );
+			}
 
-				// Validate parameters
-				if ( !$collapsible.jquery ) { // $collapsible must be an instance of jQuery
-					return;
-				}
-				if ( action !== 'expand' && action !== 'collapse' ) {
-					// action must be string with 'expand' or 'collapse'
-					return;
-				}
-				if ( $defaultToggle === undefined ) {
-					$defaultToggle = null;
-				}
-				if ( $defaultToggle !== null && !($defaultToggle instanceof $) ) {
-					// is optional (may be undefined), but if defined it must be an instance of jQuery.
-					// If it's not, abort right away.
-					// After this $defaultToggle is either null or a valid jQuery instance.
-					return;
+			if ( action === 'collapse' ) {
+				// Hide all table rows of this table
+				// Slide doesn't work with tables, but fade does as of jQuery 1.1.3
+				// http://stackoverflow.com/questions/467336#920480
+				if ( options.instantHide ) {
+					$containers.hide();
+					hookCallback();
+				} else {
+					$containers.stop( true, true ).fadeOut().promise().done( hookCallback );
 				}
+			} else {
+				$containers.stop( true, true ).fadeIn().promise().done( hookCallback );
+			}
 
-				if ( action === 'collapse' ) {
-
-					// Collapse the element
-					if ( $collapsible.is( 'table' ) ) {
-						// Hide all table rows of this table
-						// Slide doens't work with tables, but fade does as of jQuery 1.1.3
-						// http://stackoverflow.com/questions/467336#920480
-						$containers = $collapsible.find( '>tbody>tr' );
-						if ( $defaultToggle ) {
-							// Exclude tablerow containing togglelink
-							$containers.not( $defaultToggle.closest( 'tr' ) ).stop(true, true).fadeOut();
-						} else {
-							if ( instantHide ) {
-								$containers.hide();
-							} else {
-								$containers.stop( true, true ).fadeOut();
-							}
-						}
-
-					} else if ( $collapsible.is( 'ul' ) || $collapsible.is( 'ol' ) ) {
-						$containers = $collapsible.find( '> li' );
-						if ( $defaultToggle ) {
-							// Exclude list-item containing togglelink
-							$containers.not( $defaultToggle.parent() ).stop( true, true ).slideUp();
-						} else {
-							if ( instantHide ) {
-								$containers.hide();
-							} else {
-								$containers.stop( true, true ).slideUp();
-							}
-						}
-
-					} else { // <div>, <p> etc.
-						$collapsibleContent = $collapsible.find( '> .mw-collapsible-content' );
-
-						// If a collapsible-content is defined, collapse it
-						if ( $collapsibleContent.length ) {
-							if ( instantHide ) {
-								$collapsibleContent.hide();
-							} else {
-								$collapsibleContent.slideUp();
-							}
-
-						// Otherwise assume this is a customcollapse with a remote toggle
-						// .. and there is no collapsible-content because the entire element should be toggled
-						} else {
-							if ( $collapsible.is( 'tr' ) || $collapsible.is( 'td' ) || $collapsible.is( 'th' ) ) {
-								$collapsible.fadeOut();
-							} else {
-								$collapsible.slideUp();
-							}
-						}
-					}
+		} else if ( !options.plainMode && ( $collapsible.is( 'ul' ) || $collapsible.is( 'ol' ) ) ) {
+			// Lists
+			$containers = $collapsible.find( '> li' );
+			if ( $defaultToggle ) {
+				// Exclude list-item containing togglelink
+				$containers = $containers.not( $defaultToggle.parent() );
+			}
 
+			if ( action === 'collapse' ) {
+				if ( options.instantHide ) {
+					$containers.hide();
+					hookCallback();
 				} else {
+					$containers.stop( true, true ).slideUp().promise().done( hookCallback );
+				}
+			} else {
+				$containers.stop( true, true ).slideDown().promise().done( hookCallback );
+			}
 
-					// Expand the element
-					if ( $collapsible.is( 'table' ) ) {
-						$containers = $collapsible.find( '>tbody>tr' );
-						if ( $defaultToggle ) {
-							// Exclude tablerow containing togglelink
-							$containers.not( $defaultToggle.parent().parent() ).stop(true, true).fadeIn();
-						} else {
-							$containers.stop(true, true).fadeIn();
-						}
-
-					} else if ( $collapsible.is( 'ul' ) || $collapsible.is( 'ol' ) ) {
-						$containers = $collapsible.find( '> li' );
-						if ( $defaultToggle ) {
-							// Exclude list-item containing togglelink
-							$containers.not( $defaultToggle.parent() ).stop( true, true ).slideDown();
-						} else {
-							$containers.stop( true, true ).slideDown();
-						}
-
-					} else { // <div>, <p> etc.
-						$collapsibleContent = $collapsible.find( '> .mw-collapsible-content' );
-
-						// If a collapsible-content is defined, collapse it
-						if ( $collapsibleContent.length ) {
-							$collapsibleContent.slideDown();
+		} else {
+			// Everything else: <div>, <p> etc.
+			$collapsibleContent = $collapsible.find( '> .mw-collapsible-content' );
 
-						// Otherwise assume this is a customcollapse with a remote toggle
-						// .. and there is no collapsible-content because the entire element should be toggled
-						} else {
-							if ( $collapsible.is( 'tr' ) || $collapsible.is( 'td' ) || $collapsible.is( 'th' ) ) {
-								$collapsible.fadeIn();
-							} else {
-								$collapsible.slideDown();
-							}
-						}
+			// If a collapsible-content is defined, act on it
+			if ( !options.plainMode && $collapsibleContent.length ) {
+				if ( action === 'collapse' ) {
+					if ( options.instantHide ) {
+						$collapsibleContent.hide();
+						hookCallback();
+					} else {
+						$collapsibleContent.slideUp().promise().done( hookCallback );
 					}
+				} else {
+					$collapsibleContent.slideDown().promise().done( hookCallback );
 				}
-			},
-			// Toggles collapsible and togglelink class and updates text label
-			toggleLinkDefault = function ( that, e ) {
-				var $that = $(that),
-					$collapsible = $that.closest( '.mw-collapsible.mw-made-collapsible' ).toggleClass( 'mw-collapsed' );
-				e.preventDefault();
-				e.stopPropagation();
 
-				// It's expanded right now
-				if ( !$that.hasClass( 'mw-collapsible-toggle-collapsed' ) ) {
-					// Change link to "Show"
-					$that.removeClass( 'mw-collapsible-toggle-expanded' ).addClass( 'mw-collapsible-toggle-collapsed' );
-					if ( $that.find( '> a' ).length ) {
-						$that.find( '> a' ).text( expandtext );
+			// Otherwise assume this is a customcollapse with a remote toggle
+			// .. and there is no collapsible-content because the entire element should be toggled
+			} else {
+				if ( action === 'collapse' ) {
+					if ( options.instantHide ) {
+						$collapsible.hide();
+						hookCallback();
 					} else {
-						$that.text( expandtext );
+						if ( $collapsible.is( 'tr' ) || $collapsible.is( 'td' ) || $collapsible.is( 'th' ) ) {
+							$collapsible.fadeOut().promise().done( hookCallback );
+						} else {
+							$collapsible.slideUp().promise().done( hookCallback );
+						}
 					}
-					// Collapse element
-					toggleElement( $collapsible, 'collapse', $that );
-
-				// It's collapsed right now
 				} else {
-					// Change link to "Hide"
-					$that.removeClass( 'mw-collapsible-toggle-collapsed' ).addClass( 'mw-collapsible-toggle-expanded' );
-					if ( $that.find( '> a' ).length ) {
-						$that.find( '> a' ).text( collapsetext );
+					if ( $collapsible.is( 'tr' ) || $collapsible.is( 'td' ) || $collapsible.is( 'th' ) ) {
+						$collapsible.fadeIn().promise().done( hookCallback );
 					} else {
-						$that.text( collapsetext );
+						$collapsible.slideDown().promise().done( hookCallback );
 					}
-					// Expand element
-					toggleElement( $collapsible, 'expand', $that );
 				}
+			}
+		}
+	}
+
+	/**
+	 * Handles clicking/keypressing on the collapsible element toggle and other
+	 * situations where a collapsible element is toggled (e.g. the initial
+	 * toggle for collapsed ones).
+	 *
+	 * @param {jQuery} $toggle the clickable toggle itself
+	 * @param {jQuery} $collapsible the collapsible element
+	 * @param {jQuery.Event|null} e either the event or null if unavailable
+	 * @param {Object|undefined} options
+	 */
+	function togglingHandler( $toggle, $collapsible, e, options ) {
+		var wasCollapsed, $textContainer, collapseText, expandText;
+
+		if ( options === undefined ) {
+			options = {};
+		}
+
+		if ( e ) {
+			if ( e.type === 'click' && options.linksPassthru && $.nodeName( e.target, 'a' ) ) {
+				// Don't fire if a link was clicked, if requested  (for premade togglers by default)
 				return;
-			},
-			// Toggles collapsible and togglelink class
-			toggleLinkPremade = function ( $that, e ) {
-				var $collapsible = $that.eq(0).closest( '.mw-collapsible.mw-made-collapsible' ).toggleClass( 'mw-collapsed' );
-				if ( $(e.target).is( 'a' ) ) {
-					return true;
-				}
+			} else if ( e.type === 'keypress' && e.which !== 13 && e.which !== 32 ) {
+				// Only handle keypresses on the "Enter" or "Space" keys
+				return;
+			} else {
 				e.preventDefault();
 				e.stopPropagation();
+			}
+		}
 
-				// It's expanded right now
-				if ( !$that.hasClass( 'mw-collapsible-toggle-collapsed' ) ) {
-					// Change toggle to collapsed
-					$that.removeClass( 'mw-collapsible-toggle-expanded' ).addClass( 'mw-collapsible-toggle-collapsed' );
-					// Collapse element
-					toggleElement( $collapsible, 'collapse', $that );
-
-				// It's collapsed right now
-				} else {
-					// Change toggle to expanded
-					$that.removeClass( 'mw-collapsible-toggle-collapsed' ).addClass( 'mw-collapsible-toggle-expanded' );
-					// Expand element
-					toggleElement( $collapsible, 'expand', $that );
-				}
-				return;
-			},
-			// Toggles customcollapsible
-			toggleLinkCustom = function ( $that, e, $collapsible ) {
-				// For the initial state call of customtogglers there is no event passed
-				if (e) {
-					e.preventDefault();
-					e.stopPropagation();
-				}
-				// Get current state and toggle to the opposite
-				var action = $collapsible.hasClass( 'mw-collapsed' ) ? 'expand' : 'collapse';
-				$collapsible.toggleClass( 'mw-collapsed' );
-				toggleElement( $collapsible, action, $that );
+		// This allows the element to be hidden on initial toggle without fiddling with the class
+		if ( options.wasCollapsed !== undefined ) {
+			wasCollapsed = options.wasCollapsed;
+		} else {
+			wasCollapsed = $collapsible.hasClass( 'mw-collapsed' );
+		}
 
-			};
+		// Toggle the state of the collapsible element (that is, expand or collapse)
+		$collapsible.toggleClass( 'mw-collapsed', !wasCollapsed );
 
-		// Use custom text or default ?
-		if ( !collapsetext ) {
-			collapsetext = mw.msg( 'collapsible-collapse' );
+		// Toggle the mw-collapsible-toggle classes, if requested (for default and premade togglers by default)
+		if ( options.toggleClasses ) {
+			$toggle
+				.toggleClass( 'mw-collapsible-toggle-collapsed', !wasCollapsed )
+				.toggleClass( 'mw-collapsible-toggle-expanded', wasCollapsed );
 		}
-		if ( !expandtext ) {
-			expandtext = mw.msg( 'collapsible-expand' );
+
+		// Toggle the text ("Show"/"Hide"), if requested (for default togglers by default)
+		if ( options.toggleText ) {
+			collapseText = options.toggleText.collapseText;
+			expandText = options.toggleText.expandText;
+
+			$textContainer = $toggle.find( '> a' );
+			if ( !$textContainer.length ) {
+				$textContainer = $toggle;
+			}
+			$textContainer.text( wasCollapsed ? collapseText : expandText );
 		}
 
-		// Create toggle link with a space around the brackets (&nbsp;[text]&nbsp;)
-		var $toggleLink =
-			$( '<a href="#"></a>' )
-				.text( collapsetext )
-				.wrap( '<span class="mw-collapsible-toggle"></span>' )
-				.parent()
-				.prepend( '&nbsp;[' )
-				.append( ']&nbsp;' )
-				.on( 'click.mw-collapse', function ( e ) {
-					toggleLinkDefault( this, e );
-				} );
-
-		// Return if it has been enabled already.
-		if ( $that.hasClass( 'mw-made-collapsible' ) ) {
-			return;
-		} else {
-			$that.addClass( 'mw-made-collapsible' );
+		// And finally toggle the element state itself
+		toggleElement( $collapsible, wasCollapsed ? 'expand' : 'collapse', $toggle, options );
+	}
+
+	/**
+	 * Make any element collapsible.
+	 *
+	 * Supported options:
+	 * - collapseText: text to be used for the toggler when clicking it would
+	 *   collapse the element. Default: the 'data-collapsetext' attribute of
+	 *   the collapsible element or the content of 'collapsible-collapse'
+	 *   message.
+	 * - expandText: text to be used for the toggler when clicking it would
+	 *   expand the element. Default: the 'data-expandtext' attribute of
+	 *   the collapsible element or the content of 'collapsible-expand'
+	 *   message.
+	 * - collapsed: boolean, whether to collapse immediately. By default
+	 *   collapse only if the elements has the 'mw-collapsible' class.
+	 * - $customTogglers: jQuerified list of elements to be used as togglers
+	 *   for this collapsible element. By default, if the collapsible element
+	 *   has an id attribute like 'mw-customcollapsible-XXX', elements with a
+	 *   *class* of 'mw-customtoggle-XXX' are made togglers for it.
+	 * - plainMode: boolean, whether to use a "plain mode" when making the
+	 *   element collapsible - that is, hide entire tables and lists (instead
+	 *   of hiding only all rows but first of tables, and hiding each list
+	 *   item separately for lists) and don't wrap other elements in
+	 *   div.mw-collapsible-content. May only be used with custom togglers.
+	 */
+	$.fn.makeCollapsible = function ( options ) {
+		if ( options === undefined ) {
+			options = {};
 		}
 
-		// Check if this element has a custom position for the toggle link
-		// (ie. outside the container or deeper inside the tree)
-		// Then: Locate the custom toggle link(s) and bind them
-		if ( ( $that.attr( 'id' ) || '' ).indexOf( 'mw-customcollapsible-' ) === 0 ) {
+		return this.each( function () {
+			var $collapsible, collapseText, expandText, $toggle, actionHandler, buildDefaultToggleLink,
+				premadeToggleHandler, $toggleLink, $firstItem, collapsibleId, $customTogglers, firstval;
 
-			var thatId = $that.attr( 'id' ),
-				$customTogglers = $( '.' + thatId.replace( 'mw-customcollapsible', 'mw-customtoggle' ) );
-			mw.log( lpx + 'Found custom collapsible: #' + thatId );
+			// Ensure class "mw-collapsible" is present in case .makeCollapsible()
+			// is called on element(s) that don't have it yet.
+			$collapsible = $( this ).addClass( 'mw-collapsible' );
 
-			// Double check that there is actually a customtoggle link
-			if ( $customTogglers.length ) {
-				$customTogglers.on( 'click.mw-collapse', function ( e ) {
-					toggleLinkCustom( $(this), e, $that );
-				} );
+			// Return if it has been enabled already.
+			if ( $collapsible.data( 'mw-made-collapsible' ) ) {
+				return;
 			} else {
-				mw.log( lpx + '#' + thatId + ': Missing toggler!' );
+				$collapsible.data( 'mw-made-collapsible', true );
 			}
 
-			// Initial state
-			if ( $that.hasClass( 'mw-collapsed' ) ) {
-				$that.removeClass( 'mw-collapsed' );
-				toggleLinkCustom( $customTogglers, null, $that );
+			// Use custom text or default?
+			collapseText = options.collapseText || $collapsible.attr( 'data-collapsetext' ) || mw.msg( 'collapsible-collapse' );
+			expandText = options.expandText || $collapsible.attr( 'data-expandtext' ) || mw.msg( 'collapsible-expand' );
+
+			// Default click/keypress handler and toggle link to use when none is present
+			actionHandler = function ( e, opts ) {
+				var defaultOpts = {
+					toggleClasses: true,
+					toggleText: { collapseText: collapseText, expandText: expandText }
+				};
+				opts = $.extend( defaultOpts, options, opts );
+				togglingHandler( $( this ), $collapsible, e, opts );
+			};
+			// Default toggle link. Only build it when needed to avoid jQuery memory leaks (event data).
+			buildDefaultToggleLink = function () {
+				return $( '<a href="#"></a>' )
+					.text( collapseText )
+					.wrap( '<span class="mw-collapsible-toggle"></span>' )
+						.parent()
+						.prepend( '&nbsp;[' )
+						.append( ']&nbsp;' )
+						.on( 'click.mw-collapsible keypress.mw-collapsible', actionHandler );
+			};
+
+			// Default handler for clicking on premade toggles
+			premadeToggleHandler = function ( e, opts ) {
+				var defaultOpts = { toggleClasses: true, linksPassthru: true };
+				opts = $.extend( defaultOpts, options, opts );
+				togglingHandler( $( this ), $collapsible, e, opts );
+			};
+
+			// Check if this element has a custom position for the toggle link
+			// (ie. outside the container or deeper inside the tree)
+			if ( options.$customTogglers ) {
+				$customTogglers = $( options.$customTogglers );
+			} else {
+				collapsibleId = $collapsible.attr( 'id' ) || '';
+				if ( collapsibleId.indexOf( 'mw-customcollapsible-' ) === 0 ) {
+					mw.log( lpx + 'Found custom collapsible: #' + collapsibleId );
+					$customTogglers = $( '.' + collapsibleId.replace( 'mw-customcollapsible', 'mw-customtoggle' ) );
+
+					// Double check that there is actually a customtoggle link
+					if ( !$customTogglers.length ) {
+						mw.log( lpx + '#' + collapsibleId + ': Missing toggler!' );
+					}
+				}
 			}
 
-		// If this is not a custom case, do the default:
-		// Wrap the contents add the toggle link
-		} else {
+			// Bind the togglers
+			if ( $customTogglers && $customTogglers.length ) {
+				actionHandler = function ( e, opts ) {
+					var defaultOpts = {};
+					opts = $.extend( defaultOpts, options, opts );
+					togglingHandler( $( this ), $collapsible, e, opts );
+				};
 
-			// Elements are treated differently
-			if ( $that.is( 'table' ) ) {
-				// The toggle-link will be in one the the cells (td or th) of the first row
-				var $firstRowCells = $that.find( 'tr:first th, tr:first td' );
-				$toggle = $firstRowCells.find( '> .mw-collapsible-toggle' );
+				$toggleLink = $customTogglers;
+				$toggleLink.on( 'click.mw-collapsible keypress.mw-collapsible', actionHandler );
 
-				// If theres no toggle link, add it to the last cell
-				if ( !$toggle.length ) {
-					$firstRowCells.eq(-1).prepend( $toggleLink );
-				} else {
-					$toggleLink = $toggle.off( 'click.mw-collapse' ).on( 'click.mw-collapse', function ( e ) {
-						toggleLinkPremade( $toggle, e );
-					} );
-				}
+			} else {
+				// If this is not a custom case, do the default: wrap the
+				// contents and add the toggle link. Different elements are
+				// treated differently.
+				if ( $collapsible.is( 'table' ) ) {
+					// The toggle-link will be in one the the cells (td or th) of the first row
+					$firstItem = $collapsible.find( 'tr:first th, tr:first td' );
+					$toggle = $firstItem.find( '> .mw-collapsible-toggle' );
+
+					// If theres no toggle link, add it to the last cell
+					if ( !$toggle.length ) {
+						$toggleLink = buildDefaultToggleLink().prependTo( $firstItem.eq( -1 ) );
+					} else {
+						actionHandler = premadeToggleHandler;
+						$toggleLink = $toggle.on( 'click.mw-collapsible keypress.mw-collapsible', actionHandler );
+					}
 
-			} else if ( $that.is( 'ul' ) || $that.is( 'ol' ) ) {
-				// The toggle-link will be in the first list-item
-				var $firstItem = $that.find( 'li:first' );
-				$toggle = $firstItem.find( '> .mw-collapsible-toggle' );
-
-				// If theres no toggle link, add it
-				if ( !$toggle.length ) {
-					// Make sure the numeral order doesn't get messed up, force the first (soon to be second) item
-					// to be "1". Except if the value-attribute is already used.
-					// If no value was set WebKit returns "", Mozilla returns '-1', others return null or undefined.
-					var firstval = $firstItem.attr( 'value' );
-					if ( firstval === undefined || !firstval || firstval === '-1' || firstval === -1 ) {
-						$firstItem.attr( 'value', '1' );
+				} else if ( $collapsible.is( 'ul' ) || $collapsible.is( 'ol' ) ) {
+					// The toggle-link will be in the first list-item
+					$firstItem = $collapsible.find( 'li:first' );
+					$toggle = $firstItem.find( '> .mw-collapsible-toggle' );
+
+					// If theres no toggle link, add it
+					if ( !$toggle.length ) {
+						// Make sure the numeral order doesn't get messed up, force the first (soon to be second) item
+						// to be "1". Except if the value-attribute is already used.
+						// If no value was set WebKit returns "", Mozilla returns '-1', others return 0, null or undefined.
+						firstval = $firstItem.attr( 'value' );
+						if ( firstval === undefined || !firstval || firstval === '-1' || firstval === -1 ) {
+							$firstItem.attr( 'value', '1' );
+						}
+						$toggleLink = buildDefaultToggleLink();
+						$toggleLink.wrap( '<li class="mw-collapsible-toggle-li"></li>' ).parent().prependTo( $collapsible );
+					} else {
+						actionHandler = premadeToggleHandler;
+						$toggleLink = $toggle.on( 'click.mw-collapsible keypress.mw-collapsible', actionHandler );
 					}
-					$that.prepend( $toggleLink.wrap( '<li class="mw-collapsible-toggle-li"></li>' ).parent() );
-				} else {
-					$toggleLink = $toggle.off( 'click.mw-collapse' ).on( 'click.mw-collapse', function ( e ) {
-						toggleLinkPremade( $toggle, e );
-					} );
-				}
 
-			} else { // <div>, <p> etc.
+				} else { // <div>, <p> etc.
 
-				// The toggle-link will be the first child of the element
-				$toggle = $that.find( '> .mw-collapsible-toggle' );
+					// The toggle-link will be the first child of the element
+					$toggle = $collapsible.find( '> .mw-collapsible-toggle' );
 
-				// If a direct child .content-wrapper does not exists, create it
-				if ( !$that.find( '> .mw-collapsible-content' ).length ) {
-					$that.wrapInner( '<div class="mw-collapsible-content"></div>' );
-				}
+					// If a direct child .content-wrapper does not exists, create it
+					if ( !$collapsible.find( '> .mw-collapsible-content' ).length ) {
+						$collapsible.wrapInner( '<div class="mw-collapsible-content"></div>' );
+					}
 
-				// If theres no toggle link, add it
-				if ( !$toggle.length ) {
-					$that.prepend( $toggleLink );
-				} else {
-					$toggleLink = $toggle.off( 'click.mw-collapse' ).on( 'click.mw-collapse', function ( e ) {
-						toggleLinkPremade( $toggle, e );
-					} );
+					// If theres no toggle link, add it
+					if ( !$toggle.length ) {
+						$toggleLink = buildDefaultToggleLink().prependTo( $collapsible );
+					} else {
+						actionHandler = premadeToggleHandler;
+						$toggleLink = $toggle.on( 'click.mw-collapsible keypress.mw-collapsible', actionHandler );
+					}
 				}
 			}
-		}
 
-		// Initial state (only for those that are not custom)
-		if ( $that.hasClass( 'mw-collapsed' ) && ( $that.attr( 'id' ) || '').indexOf( 'mw-customcollapsible-' ) !== 0 ) {
-			$that.removeClass( 'mw-collapsed' );
-			// The collapsible element could have multiple togglers
-			// To toggle the initial state only click one of them (ie. the first one, eq(0) )
-			// Else it would go like: hide,show,hide,show for each toggle link.
-			toggleElement( $that, 'collapse', $toggleLink.eq(0), /* instantHide = */ true );
-			$toggleLink.eq(0).click();
-		}
-	} );
-};
+			// Attributes for accessibility. This isn't necessary when the toggler is already
+			// an <a> or a <button> etc., but it doesn't hurt either, and it's consistent.
+			$toggleLink.prop( 'tabIndex', 0 );
 
+			// Initial state
+			if ( options.collapsed || $collapsible.hasClass( 'mw-collapsed' ) ) {
+				// One toggler can hook to multiple elements, and one element can have
+				// multiple togglers. This is the sanest way to handle that.
+				actionHandler.call( $toggleLink.get( 0 ), null, { instantHide: true, wasCollapsed: false } );
+			}
+		} );
+	};
 }( jQuery, mediaWiki ) );