Merge "Upstream "pulsating dot" widget from VE"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index d4dd900..72fe627 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -139,16 +139,16 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.base' => [
-               'scripts' => [
-                       // This MUST be kept in sync with maintenance/jsduck/eg-iframe.html
-                       'resources/src/mediawiki.base/mediawiki.errorLogger.js',
-                       'resources/src/mediawiki.base/mediawiki.base.js',
-               ],
-               'dependencies' => 'jquery',
-               'targets' => [ 'desktop', 'mobile' ],
-       ],
-       'mediawiki.legacy.wikibits' => [
-               'scripts' => 'resources/src/mediawiki.legacy/wikibits.js',
+               'scripts' => array_merge(
+                       [
+                               // This MUST be kept in sync with maintenance/jsduck/eg-iframe.html
+                               'resources/src/mediawiki.base/mediawiki.errorLogger.js',
+                               'resources/src/mediawiki.base/mediawiki.base.js',
+                       ],
+                       $GLOBALS['wgIncludeLegacyJavaScript']
+                               ? [ 'resources/src/mediawiki.base/legacy.wikibits.js' ]
+                               : []
+               ),
                'dependencies' => 'jquery',
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -266,11 +266,6 @@ return [
                'scripts' => 'resources/src/jquery/jquery.mw-jump.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
-       'jquery.qunit' => [
-               'scripts' => 'resources/lib/qunitjs/qunit.js',
-               'styles' => 'resources/lib/qunitjs/qunit.css',
-               'targets' => [ 'desktop', 'mobile' ],
-       ],
        'jquery.spinner' => [
                'scripts' => 'resources/src/jquery.spinner/spinner.js',
                'styles' => 'resources/src/jquery.spinner/spinner.less',
@@ -768,10 +763,6 @@ return [
        ],
 
        /* MediaWiki */
-       'mediawiki.apihelp' => [
-               'styles' => 'resources/src/mediawiki.apihelp.css',
-               'targets' => [ 'desktop' ],
-       ],
        'mediawiki.template' => [
                'scripts' => 'resources/src/mediawiki.template.js',
                'targets' => [ 'desktop', 'mobile' ],
@@ -790,7 +781,10 @@ return [
                'dependencies' => 'mediawiki.template',
        ],
        'mediawiki.apipretty' => [
-               'styles' => 'resources/src/mediawiki.apipretty.css',
+               'styles' => [
+                       'resources/src/mediawiki.apipretty/apipretty.css',
+                       'resources/src/mediawiki.apipretty/apihelp.css',
+               ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.api' => [
@@ -1165,6 +1159,7 @@ return [
                        'upload-form-label-usage-filename',
                        'action-upload',
                        'apierror-mustbeloggedin',
+                       'apierror-permissiondenied',
                        'badaccess-groups',
                        'apierror-timeout',
                        'apierror-offline',
@@ -1746,6 +1741,7 @@ return [
        /* MediaWiki Special pages */
 
        'mediawiki.rcfilters.filters.base.styles' => [
+               'targets' => [ 'desktop', 'mobile' ],
                'skinStyles' => [
                        'default' => 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less',
                ],
@@ -1759,6 +1755,7 @@ return [
                ],
        ],
        'mediawiki.rcfilters.filters.dm' => [
+               'targets' => [ 'desktop', 'mobile' ],
                'localBasePath' => "$IP/resources/src/mediawiki.rcfilters",
                'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.rcfilters",
                'packageFiles' => [
@@ -1789,6 +1786,7 @@ return [
                ],
        ],
        'mediawiki.rcfilters.filters.ui' => [
+               'targets' => [ 'desktop', 'mobile' ],
                'localBasePath' => "$IP/resources/src/mediawiki.rcfilters",
                'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.rcfilters",
                'packageFiles' => [
@@ -1859,6 +1857,7 @@ return [
                        'styles/mw.rcfilters.ui.RclToOrFromWidget.less',
                        'styles/mw.rcfilters.ui.RclTargetPageWidget.less',
                        'styles/mw.rcfilters.ui.WatchlistTopSectionWidget.less',
+                       'styles/mw.rcfilters.ui.FilterTagMultiselectWidgetMobile.less'
                ],
                'skinStyles' => [
                        'vector' => [
@@ -1906,6 +1905,7 @@ return [
                        'rcfilters-clear-all-filters',
                        'rcfilters-show-new-changes',
                        'rcfilters-search-placeholder',
+                       'rcfilters-search-placeholder-mobile',
                        'rcfilters-invalid-filter',
                        'rcfilters-empty-filter',
                        'rcfilters-filterlist-title',
@@ -1940,6 +1940,8 @@ return [
                        'rcfilters-filter-showlinkedto-label',
                        'rcfilters-filter-showlinkedto-option-label',
                        'rcfilters-target-page-placeholder',
+                       'rcfilters-allcontents-label',
+                       'rcfilters-alldiscussions-label',
                        'blanknamespace',
                        'namespaces',
                        'tags-title',
@@ -1967,11 +1969,13 @@ return [
                        'oojs-ui.styles.icons-interactions',
                        'oojs-ui.styles.icons-layout',
                        'oojs-ui.styles.icons-media',
+                       'oojs-ui-windows.icons'
                ],
        ],
        'mediawiki.interface.helpers.styles' => [
                'class' => ResourceLoaderLessVarFileModule::class,
                'lessMessages' => [
+                       'comma-separator',
                        'parentheses-start',
                        'parentheses-end',
                        'brackets-start',
@@ -2825,13 +2829,6 @@ return [
                ],
        ],
 
-       // @todo FIXME: Remove 7 days after Ib0020b6bd0156 is deployed to all wikis.
-       'html5shiv' => [
-               'scripts' => [
-                       'resources/lib/html5shiv/html5shiv.js'
-               ],
-       ],
-
        /* EasyDeflate */
 
        'easy-deflate.core' => [