Quick fixes for mw.ForeignUpload

[lhc/web/wiklou.git] / resources / Resources.php

diff --git a/resources/Resources.php b/resources/Resources.php
index 9affe26..4a4ad86 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1244,7 +1244,7 @@ return array(
                'dependencies' => array(
                        'mediawiki.ForeignStructuredUpload',
                        'mediawiki.Upload.BookletLayout',
-                       'mediawiki.widgets',
+                       'mediawiki.widgets.CategorySelector',
                        'mediawiki.widgets.DateInputWidget',
                        'mediawiki.jqueryMsg',
                ),
@@ -1255,9 +1255,12 @@ return array(
                        'foreign-structured-upload-form-label-own-work-message-default',
                        'foreign-structured-upload-form-label-not-own-work-message-default',
                        'foreign-structured-upload-form-label-not-own-work-local-default',
-                       'foreign-structured-upload-form-label-own-work-message-wikimediacommons',
-                       'foreign-structured-upload-form-label-not-own-work-message-wikimediacommons',
-                       'foreign-structured-upload-form-label-not-own-work-local-wikimediacommons',
+                       'foreign-structured-upload-form-label-own-work-message-shared',
+                       'foreign-structured-upload-form-label-not-own-work-message-shared',
+                       'foreign-structured-upload-form-label-not-own-work-local-shared',
+                       'foreign-structured-upload-form-label-own-work-message-local',
+                       'foreign-structured-upload-form-label-not-own-work-message-local',
+                       'foreign-structured-upload-form-label-not-own-work-local-local',
                ),
        ),
        'mediawiki.toc' => array(
@@ -1850,9 +1853,6 @@ return array(
                'styles' => array(
                        // @todo: Remove mediawiki.page.gallery when cache has cleared
                        'resources/src/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' )
                ),
        ),
@@ -1867,9 +1867,6 @@ return array(
                'styles' => array(
                        // @todo: Remove when mediawiki.page.gallery in cached html.
                        'resources/src/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' )
                ),
        ),
@@ -1974,8 +1971,6 @@ return array(
                        '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.CategoryCapsuleItemWidget.js',
-                       'resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js',
                ),
                'skinStyles' => array(
                        'default' => array(
@@ -1991,6 +1986,8 @@ return array(
                        'jquery.byteLimit',
                        // TitleOptionWidget
                        'jquery.autoEllipsis',
+                       // FIXME: Kept for bc
+                       'mediawiki.widgets.CategorySelector',
                ),
                'messages' => array(
                        // NamespaceInputWidget
@@ -2034,6 +2031,17 @@ return array(
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
+       'mediawiki.widgets.CategorySelector' => array(
+               'scripts' => array(
+                       'resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js',
+                       'resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js',
+               ),
+               'dependencies' => array(
+                       'oojs-ui',
+                       'mediawiki.api',
+               ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
 
        /* es5-shim */
        'es5-shim' => array(