X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2FResources.php;h=c63eb96cf280422062b8728c5d6e0a559b47a2bf;hb=f7ca65da889d5b2b798d82fcf175ab8960a76139;hp=b7243067353fee94df0f674bf80da18d7063425c;hpb=c9f5696745a4d5f2434c164135921fd6960e11b7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/Resources.php b/resources/Resources.php
index b724306735..c63eb96cf2 100644
--- 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
@@ -1332,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' => [
@@ -1418,6 +1426,7 @@ return [
 	'mediawiki.action.delete.file' => [
 		'scripts' => 'resources/src/mediawiki.action/mediawiki.action.delete.file.js',
 		'dependencies' => [
+			'oojs-ui-core',
 			'jquery.lengthLimit',
 		],
 		'messages' => [
@@ -1561,7 +1570,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',
@@ -1579,10 +1590,8 @@ return [
 			'sl' => 'resources/src/mediawiki.language/languages/sl.js',
 		],
 		'dependencies' => [
-			'mediawiki.language.data',
 			'mediawiki.cldr',
 		],
-		'targets' => [ 'desktop', 'mobile' ],
 		'messages' => [
 			'and',
 			'comma-separator',
@@ -1606,11 +1615,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,
@@ -1976,6 +1980,7 @@ return [
 			'resources/src/mediawiki.special/comparepages.less',
 			'resources/src/mediawiki.special/edittags.css',
 			'resources/src/mediawiki.special/movePage.css',
+			'resources/src/mediawiki.special/newpages.less',
 			'resources/src/mediawiki.special/pagesWithProp.css',
 			'resources/src/mediawiki.special/upload.css',
 			'resources/src/mediawiki.special/userrights.css',
@@ -2768,6 +2773,25 @@ return [
 		'raw' => true,
 	],
 
+	/* EasyDeflate */
+
+	'easy-deflate.core' => [
+		'scripts' => [ 'resources/lib/easy-deflate/easydeflate.js' ],
+		'targets' => [ 'desktop', 'mobile' ],
+	],
+
+	'easy-deflate.deflate' => [
+		'scripts' => [ 'resources/lib/easy-deflate/deflate.js' ],
+		'dependencies' => [ 'easy-deflate.core' ],
+		'targets' => [ 'desktop', 'mobile' ],
+	],
+
+	'easy-deflate.inflate' => [
+		'scripts' => [ 'resources/lib/easy-deflate/inflate.js' ],
+		'dependencies' => [ 'easy-deflate.core' ],
+		'targets' => [ 'desktop', 'mobile' ],
+	],
+
 	/* OOjs */
 	'oojs' => [
 		'scripts' => [