Merge "profiler: Centralise output responsibility from ProfilerOutputText to Profiler"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 133ba0f..8234e89 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' ],
        ],
@@ -1042,6 +1042,12 @@ return [
        'mediawiki.pager.tablePager' => [
                'styles' => 'resources/src/mediawiki.pager.tablePager/TablePager.less',
        ],
+       'mediawiki.pulsatingdot' => [
+               'styles' => [
+                       'resources/src/mediawiki.pulsatingdot/mediawiki.pulsatingdot.less',
+               ],
+               'targets' => [ 'desktop', 'mobile' ],
+       ],
        'mediawiki.searchSuggest' => [
                'targets' => [ 'desktop', 'mobile' ],
                'scripts' => 'resources/src/mediawiki.searchSuggest/searchSuggest.js',
@@ -1370,7 +1376,7 @@ return [
                        'oojs-ui-core',
                ],
                'messages' => [
-                       // Keep the uses message keys in sync with EditPage#setHeaders
+                       // Keep these message keys in sync with EditPage#setHeaders
                        'creating',
                        'editconflict',
                        'editing',
@@ -1934,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,6 +1975,7 @@ return [
        'mediawiki.interface.helpers.styles' => [
                'class' => ResourceLoaderLessVarFileModule::class,
                'lessMessages' => [
+                       'comma-separator',
                        'parentheses-start',
                        'parentheses-end',
                        'brackets-start',
@@ -2820,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' => [