From: Ryan Lane <rlane@wikimedia.org>
Date: Wed, 1 May 2013 21:15:32 +0000 (-0500)
Subject: mediawiki.htmlform: Preserve classes added by HTMLForm's cssclass option
X-Git-Tag: 1.31.0-rc.0~19789^2~1
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=2cdd05983398827eadbe25fd7fe0c8e0c08e6571;p=lhc%2Fweb%2Fwiklou.git

mediawiki.htmlform: Preserve classes added by HTMLForm's cssclass option

Follow-up to commit 8a9341b. When changing the multi-select
checkbox container to a select multiple, preserve any custom
classes added via the cssclass argument for the htmlform field.

Change-Id: I41d2a306627b33b34d7e464147d771cc727f4f61
---

diff --git a/resources/mediawiki/mediawiki.htmlform.js b/resources/mediawiki/mediawiki.htmlform.js
index 433679018f..0a2819b047 100644
--- a/resources/mediawiki/mediawiki.htmlform.js
+++ b/resources/mediawiki/mediawiki.htmlform.js
@@ -61,13 +61,15 @@
 
 	function addMulti( $oldContainer, $container ) {
 		var name = $oldContainer.find( 'input:first-child' ).attr( 'name' ),
-		$select = $( '<select>' ),
-		dataPlaceholder = mw.message( 'htmlform-chosen-placeholder' );
+			oldClass = ( ' ' + $oldContainer.attr( 'class' ) + ' ' ).replace( /(mw-htmlform-field-HTMLMultiSelectField|mw-chosen)/g, '' ),
+			$select = $( '<select>' ),
+			dataPlaceholder = mw.message( 'htmlform-chosen-placeholder' );
+		oldClass = $.trim( oldClass );
 		$select.attr( {
 			name: name,
 			multiple: 'multiple',
 			'data-placeholder': dataPlaceholder.plain(),
-			'class': 'htmlform-chzn-select mw-input'
+			'class': 'htmlform-chzn-select mw-input ' + oldClass
 		} );
 		$oldContainer.find( 'input' ).each( function () {
 			var $oldInput = $(this),