From: Florian <florian.schmidt.stargatewissen@gmail.com>
Date: Mon, 5 Oct 2015 17:50:15 +0000 (+0200)
Subject: Split out UserInputWidgets from mediawiki.widgets
X-Git-Tag: 1.31.0-rc.0~9501^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=abd721cb38ca2d2c05b5a9d299bd5e63824b95e2;p=lhc%2Fweb%2Fwiklou.git

Split out UserInputWidgets from mediawiki.widgets

Move it to its own module mediawiki.widgets.UserInputWidget. It's
currently used in HTMLUserTextField only.

Bug: T108733
Change-Id: Id8c6dd5d9616086bdb0918442bfafe9ec708ab31
---

diff --git a/includes/htmlform/HTMLUserTextField.php b/includes/htmlform/HTMLUserTextField.php
index 5869002b95..9617c0a35a 100644
--- a/includes/htmlform/HTMLUserTextField.php
+++ b/includes/htmlform/HTMLUserTextField.php
@@ -40,7 +40,7 @@ class HTMLUserTextField extends HTMLTextField {
 	}
 
 	protected function getInputWidget( $params ) {
-		$this->mParent->getOutput()->addModules( 'mediawiki.widgets' );
+		$this->mParent->getOutput()->addModules( 'mediawiki.widgets.UserInputWidget' );
 
 		return new UserInputWidget( $params );
 	}
diff --git a/resources/Resources.php b/resources/Resources.php
index 5504fd7857..f0b7cd5b62 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1967,7 +1967,6 @@ return array(
 			'resources/src/mediawiki.widgets/mw.widgets.TitleSearchWidget.js',
 			'resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js',
 			'resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js',
-			'resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js',
 		),
 		'skinStyles' => array(
 			'default' => array(
@@ -2039,6 +2038,14 @@ return array(
 		),
 		'targets' => array( 'desktop', 'mobile' ),
 	),
+	'mediawiki.widgets.UserInputWidget' => array(
+		'scripts' => array(
+			'resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js',
+		),
+		'dependencies' => array(
+			'oojs-ui',
+		),
+	),
 
 	/* es5-shim */
 	'es5-shim' => array(
diff --git a/resources/src/mediawiki/page/ready.js b/resources/src/mediawiki/page/ready.js
index 8ec4cf0c67..9505bdd1e0 100644
--- a/resources/src/mediawiki/page/ready.js
+++ b/resources/src/mediawiki/page/ready.js
@@ -62,7 +62,8 @@
 		// Infuse OOUI widgets, if any are present
 		$nodes = $( '[data-ooui]' );
 		if ( $nodes.length ) {
-			mw.loader.using( 'mediawiki.widgets' ).done( function () {
+			// FIXME: We should only load the widgets that are being infused
+			mw.loader.using( [ 'mediawiki.widgets', 'mediawiki.widgets.UserInputWidget' ] ).done( function () {
 				$nodes.each( function () {
 					OO.ui.infuse( this );
 				} );