From: Ryan Lane <rlane@wikimedia.org>
Date: Thu, 8 Aug 2013 08:11:46 +0000 (+0800)
Subject: htmlform muliselect chosen: convert each list
X-Git-Tag: 1.31.0-rc.0~18911^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/supprimer.php?a=commitdiff_plain;h=7f0aac8d77c6866a8ef6446e25803312ce308db3;p=lhc%2Fweb%2Fwiklou.git

htmlform muliselect chosen: convert each list

This change converts each checkbox list input separately, rather
than converting all together into a single select input.

Change-Id: Iec6687f7105cdb38fb92785aaa4357babaef1b4f
---

diff --git a/resources/mediawiki/mediawiki.htmlform.js b/resources/mediawiki/mediawiki.htmlform.js
index 77ceee4c77..8e764e1a2a 100644
--- a/resources/mediawiki/mediawiki.htmlform.js
+++ b/resources/mediawiki/mediawiki.htmlform.js
@@ -90,7 +90,7 @@
 		$td = $( '<td>' ),
 		$fieldLabelText = $( '<label>' ),
 		$container;
-		if ( type === 'table' ) {
+		if ( type === 'tr' ) {
 			addMulti( $oldContainer, $td );
 			$container = $( '<tr>' );
 			$container.append( $td );
@@ -110,18 +110,11 @@
 
 	if ( $( '.mw-chosen' ).length ) {
 		mw.loader.using( 'jquery.chosen', function () {
-			var $toConvert,
-			$converted;
-			$toConvert = $( 'table .mw-chosen' );
-			if ( $toConvert.length ) {
-				$converted = convertCheckboxesToMulti( $toConvert, 'table' );
+			$( '.mw-chosen' ).each( function () {
+				var type = this.nodeName.toLowerCase(),
+					$converted = convertCheckboxesToMulti( $( this ), type );
 				$converted.find( '.htmlform-chzn-select' ).chosen( { width: 'auto' } );
-			}
-			$toConvert = $( 'div .mw-chosen' );
-			if ( $toConvert.length ) {
-				$converted = convertCheckboxesToMulti( $toConvert, 'div' );
-				$converted.find( '.htmlform-chzn-select' ).chosen( { width: 'auto' } );
-			}
+			} );
 		} );
 	}