Merge "SpecialMovepage: Convert form to use OOUI controls"

diff --combined autoload.php
index 4db3ec7,d91b704..5adfbe5
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -724,6 -724,7 +724,6 @@@ $wgAutoloadLocalClasses = array
        'MWOldPassword' => __DIR__ . '/includes/password/MWOldPassword.php',
        'MWSaltedPassword' => __DIR__ . '/includes/password/MWSaltedPassword.php',
        'MWTidy' => __DIR__ . '/includes/parser/MWTidy.php',
 -      'MWTidyWrapper' => __DIR__ . '/includes/parser/MWTidy.php',
        'MWTimestamp' => __DIR__ . '/includes/MWTimestamp.php',
        'MachineReadableRCFeedFormatter' => __DIR__ . '/includes/rcfeed/MachineReadableRCFeedFormatter.php',
        'MagicWord' => __DIR__ . '/includes/MagicWord.php',
@@@ -760,14 -761,8 +760,15 @@@
        'MediaWiki\\Logger\\Monolog\\WikiProcessor' => __DIR__ . '/includes/debug/logger/monolog/WikiProcessor.php',
        'MediaWiki\\Logger\\NullSpi' => __DIR__ . '/includes/debug/logger/NullSpi.php',
        'MediaWiki\\Logger\\Spi' => __DIR__ . '/includes/debug/logger/Spi.php',
 +      'MediaWiki\\Tidy\\Html5Depurate' => __DIR__ . '/includes/tidy/Html5Depurate.php',
 +      'MediaWiki\\Tidy\\RaggettBase' => __DIR__ . '/includes/tidy/RaggettBase.php',
 +      'MediaWiki\\Tidy\\RaggettExternal' => __DIR__ . '/includes/tidy/RaggettExternal.php',
 +      'MediaWiki\\Tidy\\RaggettInternalHHVM' => __DIR__ . '/includes/tidy/RaggettInternalHHVM.php',
 +      'MediaWiki\\Tidy\\RaggettInternalPHP' => __DIR__ . '/includes/tidy/RaggettInternalPHP.php',
 +      'MediaWiki\\Tidy\\RaggettWrapper' => __DIR__ . '/includes/tidy/RaggettWrapper.php',
 +      'MediaWiki\\Tidy\\TidyDriverBase' => __DIR__ . '/includes/tidy/TidyDriverBase.php',
        'MediaWiki\\Widget\\ComplexNamespaceInputWidget' => __DIR__ . '/includes/widget/ComplexNamespaceInputWidget.php',
+       'MediaWiki\\Widget\\ComplexTitleInputWidget' => __DIR__ . '/includes/widget/ComplexTitleInputWidget.php',
        'MediaWiki\\Widget\\NamespaceInputWidget' => __DIR__ . '/includes/widget/NamespaceInputWidget.php',
        'MediaWiki\\Widget\\TitleInputWidget' => __DIR__ . '/includes/widget/TitleInputWidget.php',
        'MediaWiki\\Widget\\UserInputWidget' => __DIR__ . '/includes/widget/UserInputWidget.php',

diff --combined resources/Resources.php
index 8fc9bdd,8579d05..07142a5
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -847,12 -847,6 +847,12 @@@ return array
                        'resources/src/mediawiki/mediawiki.template.mustache.js',
                ),
                'targets' => array( 'desktop', 'mobile' ),
 +              'dependencies' => 'mediawiki.template',
 +      ),
 +      'mediawiki.template.regexp' => array(
 +              'scripts' => 'resources/src/mediawiki/mediawiki.template.regexp.js',
 +              'targets' => array( 'desktop', 'mobile' ),
 +              'dependencies' => 'mediawiki.template',
        ),
        'mediawiki.apipretty' => array(
                'styles' => 'resources/src/mediawiki/mediawiki.apipretty.css',
@@@ -1030,10 -1024,6 +1030,10 @@@
                        'colon-separator',
                ),
        ),
 +      'mediawiki.htmlform.styles' => array(
 +              'styles' => 'resources/src/mediawiki/mediawiki.htmlform.css',
 +              'position' => 'top',
 +      ),
        'mediawiki.htmlform.ooui.styles' => array(
                'styles' => 'resources/src/mediawiki/mediawiki.htmlform.ooui.css',
                'position' => 'top',
@@@ -1136,20 -1126,6 +1136,20 @@@
                        'mediawiki.api.upload',
                ),
        ),
 +      'mediawiki.ForeignUpload' => array(
 +              'scripts' => 'resources/src/mediawiki/mediawiki.ForeignUpload.js',
 +              'dependencies' => array(
 +                      'mediawiki.ForeignApi',
 +                      'mediawiki.Upload',
 +                      'oojs',
 +              ),
 +      ),
 +      'mediawiki.ForeignStructuredUpload' => array(
 +              'scripts' => 'resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js',
 +              'dependencies' => array(
 +                      'mediawiki.ForeignUpload',
 +              ),
 +      ),
        'mediawiki.Upload.Dialog' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.Upload.Dialog.js',
                'dependencies' => array(
@@@ -1180,10 -1156,6 +1180,10 @@@
        ),
        'mediawiki.Uri' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.Uri.js',
 +              'templates' => array(
 +                      'strict.regexp' => 'resources/src/mediawiki/mediawiki.Uri.strict.regexp',
 +                      'loose.regexp' => 'resources/src/mediawiki/mediawiki.Uri.loose.regexp',
 +              ),
                'dependencies' => 'mediawiki.util',
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@@ -1367,13 -1339,6 +1367,13 @@@
                        'prefs-editing'
                ),
        ),
 +      'mediawiki.action.view.filepage' => array(
 +              'styles' => array(
 +                      'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' => array( 'media' => 'print' ),
 +                      'resources/src/mediawiki.action/mediawiki.action.view.filepage.css',
 +              ),
 +              'position' => 'top',
 +      ),
  
        /* MediaWiki Language */
  
@@@ -1602,7 -1567,14 +1602,14 @@@
        ),
        'mediawiki.special.movePage' => array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.movePage.js',
-               'dependencies' => 'jquery.byteLimit',
+               'dependencies' => array(
+                       'jquery.byteLimit',
+                       'mediawiki.widgets',
+               ),
+       ),
+       'mediawiki.special.movePage.styles' => array(
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.movePage.css',
+               'position' => 'top',
        ),
        'mediawiki.special.pageLanguage' => array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.pageLanguage.js',
@@@ -1690,6 -1662,15 +1697,6 @@@
                        'resources/src/mediawiki.special/mediawiki.special.userlogin.login.css',
                ),
        ),
 -      'mediawiki.special.userlogin.common.js' => array(
 -              'scripts' => array(
 -                      'resources/src/mediawiki.special/mediawiki.special.userlogin.common.js',
 -              ),
 -              'messages' => array(
 -                      'createacct-captcha',
 -                      'createacct-imgcaptcha-ph',
 -              ),
 -      ),
        'mediawiki.special.userlogin.signup.js' => array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js',
                'messages' => array(
@@@ -1754,10 -1735,9 +1761,10 @@@
                'styles' => array(
                        // @todo: Remove mediawiki.page.gallery when cache has cleared
                        'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array( 'media' => 'print' ),
 +                      // @todo: Remove mediawiki.action.view.filepage.print.css when cache has cleared
 +                      'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' => array( 'media' => 'print' ),
                        'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
                ),
 -              'group' => 'print',
        ),
        'mediawiki.legacy.protect' => array(
                'scripts' => 'resources/src/mediawiki.legacy/protect.js',
@@@ -1770,9 -1750,6 +1777,9 @@@
                'styles' => array(
                        // @todo: Remove when mediawiki.page.gallery in cached html.
                        'resources/src/mediawiki.page/mediawiki.page.gallery.css',
 +                      // @todo: Remove mediawiki.action.view.filepage.css
 +                      // and mediawiki.legacy/images/checker.png when cache has cleared
 +                      'resources/src/mediawiki.action/mediawiki.action.view.filepage.css',
                        'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' )
                ),
        ),
@@@ -1875,9 -1852,9 +1882,10 @@@
                        'resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js',
                        'resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js',
                        'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.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',
 +                      'resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js',
                ),
                'skinStyles' => array(
                        'default' => array(
@@@ -1916,6 -1893,7 +1924,7 @@@
                'skinStyles' => array(
                        'default' => array(
                                'resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.base.css',
+                               'resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.base.css',
                        ),
                ),
                'position' => 'top',

diff --combined resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
index ee9583d,c9c9f03..d5a7abc
--- 1/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
--- 2/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
@@@ -29,10 -29,7 +29,10 @@@
                var widget = this;
  
                // Config initialization
 -              config = $.extend( { maxLength: 255 }, config );
 +              config = $.extend( {
 +                      maxLength: 255,
 +                      limit: 10
 +              }, config );
  
                // Parent constructor
                mw.widgets.TitleInputWidget.parent.call( this, $.extend( {}, config, { autocomplete: false } ) );
@@@ -41,7 -38,7 +41,7 @@@
                OO.ui.mixin.LookupElement.call( this, config );
  
                // Properties
 -              this.limit = config.limit || 10;
 +              this.limit = config.limit;
                this.maxLength = config.maxLength;
                this.namespace = config.namespace !== undefined ? config.namespace : null;
                this.relative = config.relative !== undefined ? config.relative : true;
@@@ -82,6 -79,26 +82,26 @@@
  
        /* Methods */
  
+       /**
+        * Get the namespace to prepend to titles in suggestions, if any.
+        *
+        * @return {number|null} Namespace number
+        */
+       mw.widgets.TitleInputWidget.prototype.getNamespace = function () {
+               return this.namespace;
+       };
+ 
+       /**
+        * Set the namespace to prepend to titles in suggestions, if any.
+        *
+        * @param {number|null} namespace Namespace number
+        */
+       mw.widgets.TitleInputWidget.prototype.setNamespace = function ( namespace ) {
+               this.namespace = namespace;
+               this.lookupCache = {};
+               this.closeLookupMenu();
+       };
+ 
        /**
         * @inheritdoc
         */
@@@ -128,9 -145,9 +148,9 @@@
                                        widget.interwikiPrefixes.indexOf( interwiki ) !== -1
                                ) {
                                        return $.Deferred().resolve( { query: {
 -                                              pages: [{
 +                                              pages: [ {
                                                        title: widget.value
 -                                              }]
 +                                              } ]
                                        } } ).promise( promiseAbortObject );
                                } else {
                                        params = {
@@@ -193,15 -210,15 +213,15 @@@
  
                if ( data.redirects ) {
                        for ( i = 0, len = data.redirects.length; i < len; i++ ) {
 -                              redirect = data.redirects[i];
 -                              redirectsTo[redirect.to] = redirectsTo[redirect.to] || [];
 -                              redirectsTo[redirect.to].push( redirect.from );
 +                              redirect = data.redirects[ i ];
 +                              redirectsTo[ redirect.to ] = redirectsTo[ redirect.to ] || [];
 +                              redirectsTo[ redirect.to ].push( redirect.from );
                        }
                }
  
                for ( index in data.pages ) {
 -                      suggestionPage = data.pages[index];
 -                      pageData[suggestionPage.title] = {
 +                      suggestionPage = data.pages[ index ];
 +                      pageData[ suggestionPage.title ] = {
                                missing: suggestionPage.missing !== undefined,
                                redirect: suggestionPage.redirect !== undefined,
                                disambiguation: OO.getProp( suggestionPage, 'pageprops', 'disambiguation' ) !== undefined,
@@@ -215,15 -232,15 +235,15 @@@
                                titles.push( suggestionPage.title );
                        }
  
 -                      redirects = redirectsTo[suggestionPage.title] || [];
 +                      redirects = redirectsTo[ suggestionPage.title ] || [];
                        for ( i = 0, len = redirects.length; i < len; i++ ) {
 -                              pageData[redirects[i]] = {
 +                              pageData[ redirects[ i ] ] = {
                                        missing: false,
                                        redirect: true,
                                        disambiguation: false,
                                        description: mw.msg( 'mw-widgets-titleinput-description-redirect', suggestionPage.title )
                                };
 -                              titles.push( redirects[i] );
 +                              titles.push( redirects[ i ] );
                        }
                }
  
@@@ -236,7 -253,7 +256,7 @@@
                );
  
                if ( !pageExists ) {
 -                      pageData[this.value] = {
 +                      pageData[ this.value ] = {
                                missing: true, redirect: false, disambiguation: false,
                                description: mw.msg( 'mw-widgets-titleinput-description-new-page' )
                        };
@@@ -255,8 -272,8 +275,8 @@@
                        titles.push( this.value );
                }
                for ( i = 0, len = titles.length; i < len; i++ ) {
 -                      page = pageData[titles[i]] || {};
 -                      items.push( new mw.widgets.TitleOptionWidget( this.getOptionWidgetData( titles[i], page ) ) );
 +                      page = pageData[ titles[ i ] ] || {};
 +                      items.push( new mw.widgets.TitleOptionWidget( this.getOptionWidgetData( titles[ i ], page ) ) );
                }
  
                return items;