Merge "Split out UserInputWidgets from mediawiki.widgets"

diff --git a/includes/htmlform/HTMLUserTextField.php b/includes/htmlform/HTMLUserTextField.php
index 5869002..9617c0a 100644 (file)
--- 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 4a4ad86..c635f0e 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1970,7 +1970,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(
@@ -2042,6 +2041,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 8ec4cf0..9505bdd 100644 (file)
--- 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 );
                                } );