Merge "Convert Special:Search input to OOUI"

diff --combined resources/Resources.php
index 270dbd4,0be4693..42a0746
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -436,8 -436,6 +436,8 @@@ return 
                        'ca' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-ca.js',
                        'cs' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-cs.js',
                        'da' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-da.js',
 +                      'de-at' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-AT.js',
 +                      'de-ch' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-CH.js',
                        'de' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de.js',
                        'el' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-el.js',
                        'en-au' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-en-AU.js',
@@@ -484,8 -482,8 +484,8 @@@
                        'sk' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-sk.js',
                        'sl' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-sl.js',
                        'sq' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-sq.js',
 -                      'sr-sr' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-sr-SR.js',
 -                      'sr' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-sr.js',
 +                      'sr-ec' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-sr.js',
 +                      'sr-el' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-sr-SR.js',
                        'sv' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-sv.js',
                        'ta' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-ta.js',
                        'th' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-th.js',
@@@ -799,8 -797,8 +799,8 @@@
                        'sk' => 'resources/lib/moment/locale/sk.js',
                        'sl' => 'resources/lib/moment/locale/sl.js',
                        'sq' => 'resources/lib/moment/locale/sq.js',
 -                      'sr' => 'resources/lib/moment/locale/sr.js',
                        'sr-ec' => 'resources/lib/moment/locale/sr-cyrl.js',
 +                      'sr-el' => 'resources/lib/moment/locale/sr.js',
                        'sv' => 'resources/lib/moment/locale/sv.js',
                        'ta' => 'resources/lib/moment/locale/ta.js',
                        'th' => 'resources/lib/moment/locale/th.js',
@@@ -813,8 -811,6 +813,8 @@@
                        'vi' => 'resources/lib/moment/locale/vi.js',
                        'zh-cn' => 'resources/lib/moment/locale/zh-cn.js',
                        'zh-tw' => 'resources/lib/moment/locale/zh-tw.js',
 +                      'zh-hans' => 'resources/lib/moment/locale/zh-cn.js',
 +                      'zh-hant' => 'resources/lib/moment/locale/zh-tw.js',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@@ -1200,7 -1196,6 +1200,7 @@@
                        'mediawiki.user',
                        'mediawiki.Upload',
                        'mediawiki.jqueryMsg',
 +                      'mediawiki.widgets.StashedFileWidget'
                ],
                'messages' => [
                        'upload-form-label-infoform-title',
@@@ -1256,13 -1251,11 +1256,13 @@@
                        'api-error-unknown-error',
                        'api-error-uploaddisabled',
                        'api-error-verification-error',
 +                      'api-error-was-deleted',
                        'fileexists',
                        'filepageexists',
                        'filename-bad-prefix',
                        'filename-thumb-name',
                        'badfilename',
 +                      'protectedpagetext',
                        'api-error-blacklisted', // HACK
                ],
        ],
@@@ -1683,6 -1676,7 +1683,6 @@@
        'mediawiki.page.image.pagination' => [
                'scripts' => 'resources/src/mediawiki/page/image-pagination.js',
                'dependencies' => [
 -                      'mediawiki.Uri',
                        'mediawiki.util',
                        'jquery.spinner',
                ],
@@@ -1853,6 -1847,7 +1853,7 @@@
                'position' => 'top',
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.search.js',
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.css',
+               'dependencies' => 'mediawiki.widgets.SearchInputWidget',
                'messages' => [
                        'powersearch-togglelabel',
                        'powersearch-toggleall',
@@@ -2242,19 -2237,7 +2243,19 @@@
                'position' => 'top',
                'targets' => [ 'desktop', 'mobile' ],
        ],
 -
 +      'mediawiki.widgets.StashedFileWidget' => [
 +              'scripts' => [
 +                      'resources/src/mediawiki.widgets/mw.widgets.StashedFileWidget.js',
 +              ],
 +              'skinStyles' => [
 +                      'default' => [
 +                              'resources/src/mediawiki.widgets/mw.widgets.StashedFileWidget.less',
 +                      ],
 +              ],
 +              'dependencies' => [
 +                      'oojs-ui-core',
 +              ],
 +      ],
        /* es5-shim */
        'es5-shim' => [
                'scripts' => [