Merge "Hide TOC with CSS instead of JavaScript"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index dea9293..fc24035 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -58,9 +58,6 @@ return [
        'user.options' => [ 'class' => ResourceLoaderUserOptionsModule::class ],
        'user.tokens' => [ 'class' => ResourceLoaderUserTokensModule::class ],
 
-       // Scripts for the dynamic language specific data, like grammar forms.
-       'mediawiki.language.data' => [ 'class' => ResourceLoaderLanguageDataModule::class ],
-
        /* MediaWiki base skinning modules */
 
        /**
@@ -84,8 +81,7 @@ return [
         *     The highest level, this stylesheet contains extra common styles for classes like
         *     .firstHeading, #contentSub, et cetera which are not outputted by MediaWiki but are common
         *     to skins like MonoBook, Vector, etc... Essentially this level is for styles that are
-        *     common to MonoBook clones. And since practically every skin that currently exists within
-        *     core is a MonoBook clone, all our core skins currently use this level.
+        *     common to MonoBook clones.
         *
         * These modules are typically loaded by addModuleStyles(), which has absolutely no concept of
         * dependency management. As a result they contain duplicate stylesheet references instead of
@@ -706,12 +702,6 @@ return [
                'group' => 'jquery.ui',
        ],
 
-       /* json2 */
-       'json' => [
-               'deprecated' => 'Use of the "json" module is deprecated since MediaWiki 1.29.0',
-               'targets' => [ 'desktop', 'mobile' ],
-       ],
-
        /* Moment.js */
 
        'moment' => [
@@ -843,16 +833,6 @@ return [
 
        /* MediaWiki */
 
-       'mediawiki' => [
-               'class' => ResourceLoaderRawFileModule::class,
-               // Keep in sync with maintenance/jsduck/eg-iframe.html
-               'scripts' => [
-                       'resources/src/mediawiki/mediawiki.js',
-                       'resources/src/mediawiki/mediawiki.requestIdleCallback.js',
-               ],
-               'debugScripts' => 'resources/src/mediawiki/mediawiki.log.js',
-               'targets' => [ 'desktop', 'mobile' ],
-       ],
        'mediawiki.base' => [
                // Keep in sync with maintenance/jsduck/eg-iframe.html
                'scripts' => [
@@ -1348,6 +1328,18 @@ return [
                'messages' => [ 'showtoc', 'hidetoc' ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
+       'mediawiki.toc.styles' => [
+               'class' => ResourceLoaderLessVarFileModule::class,
+               'lessMessages' => [ 'hidetoc', 'showtoc' ],
+               'styles' => [
+                       'resources/src/mediawiki.toc.styles/common.css',
+                       'resources/src/mediawiki.toc.styles/screen.less'
+                               => [ 'media' => 'screen' ],
+                       'resources/src/mediawiki.toc.styles/print.css'
+                               => [ 'media' => 'print' ],
+               ],
+               'targets' => [ 'desktop', 'mobile' ],
+       ],
        'mediawiki.Uri' => [
                'scripts' => 'resources/src/mediawiki.Uri/Uri.js',
                'templates' => [
@@ -1577,7 +1569,9 @@ return [
        /* MediaWiki Language */
 
        'mediawiki.language' => [
+               'class' => ResourceLoaderLanguageDataModule::class,
                'scripts' => [
+                       'resources/src/mediawiki.language/mediawiki.language.init.js',
                        'resources/src/mediawiki.language/mediawiki.language.js',
                        'resources/src/mediawiki.language/mediawiki.language.numbers.js',
                        'resources/src/mediawiki.language/mediawiki.language.fallback.js',
@@ -1595,10 +1589,8 @@ return [
                        'sl' => 'resources/src/mediawiki.language/languages/sl.js',
                ],
                'dependencies' => [
-                       'mediawiki.language.data',
                        'mediawiki.cldr',
                ],
-               'targets' => [ 'desktop', 'mobile' ],
                'messages' => [
                        'and',
                        'comma-separator',
@@ -1622,11 +1614,6 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
 
-       'mediawiki.language.init' => [
-               'scripts' => 'resources/src/mediawiki.language/mediawiki.language.init.js',
-               'targets' => [ 'desktop', 'mobile' ],
-       ],
-
        'mediawiki.jqueryMsg' => [
                // Add data for mediawiki.jqueryMsg, such as allowed tags
                'class' => ResourceLoaderJqueryMsgModule::class,
@@ -2200,7 +2187,7 @@ return [
        ],
        'mediawiki.special.preferences.styles.ooui' => [
                'targets' => [ 'desktop', 'mobile' ],
-               'styles' => 'resources/src/mediawiki.special.preferences.styles.ooui.css',
+               'styles' => 'resources/src/mediawiki.special.preferences.styles.ooui.less',
        ],
        'mediawiki.special.recentchanges' => [
                'scripts' => 'resources/src/mediawiki.special.recentchanges.js',
@@ -2644,7 +2631,7 @@ return [
        ],
        'mediawiki.widgets.CategoryMultiselectWidget' => [
                'scripts' => [
-                       'resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js',
+                       'resources/src/mediawiki.widgets/mw.widgets.CategoryTagItemWidget.js',
                        'resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js',
                ],
                'dependencies' => [