X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=resources%2FResources.php;h=c5183992233f97be4bcb8087844699bf4e1e27c1;hb=2873d65d9f2ba6a5f5db141d6c7326c8a8566da9;hp=dc8fd0c127e5adf9a8cbe9aaa5f9f82e5c945e8c;hpb=e22e06e4810d998315502bd091f64abda68a6f62;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/Resources.php b/resources/Resources.php
index dc8fd0c127..c518399223 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -136,14 +136,29 @@ return [
 		],
 	],
 
-	/* jQuery */
+	/* Base modules */
+	// These modules' dependencies MUST also be included in StartUpModule::getBaseModules().
+	// These modules' dependencies MUST be dependency-free (having dependencies would cause recursion).
 
 	'jquery' => [
 		'scripts' => [
 			'resources/lib/jquery/jquery.js',
 			'resources/lib/jquery/jquery.migrate.js',
 		],
-		'raw' => true,
+		'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',
+		'dependencies' => 'jquery',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 
@@ -832,15 +847,6 @@ return [
 	],
 
 	/* MediaWiki */
-
-	'mediawiki.base' => [
-		// Keep in sync with maintenance/jsduck/eg-iframe.html
-		'scripts' => [
-			'resources/src/mediawiki.base/mediawiki.errorLogger.js',
-			'resources/src/mediawiki.base/mediawiki.base.js',
-		],
-		'targets' => [ 'desktop', 'mobile' ],
-	],
 	'mediawiki.apihelp' => [
 		'styles' => 'resources/src/mediawiki.apihelp.css',
 		'targets' => [ 'desktop' ],
@@ -1328,6 +1334,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' => [
@@ -1414,6 +1432,7 @@ return [
 	'mediawiki.action.delete.file' => [
 		'scripts' => 'resources/src/mediawiki.action/mediawiki.action.delete.file.js',
 		'dependencies' => [
+			'oojs-ui-core',
 			'jquery.lengthLimit',
 		],
 		'messages' => [
@@ -1967,6 +1986,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',
@@ -2375,10 +2395,6 @@ return [
 			'resources/src/mediawiki.legacy/oldshared.css' => [ 'media' => 'screen' ]
 		],
 	],
-	'mediawiki.legacy.wikibits' => [
-		'scripts' => 'resources/src/mediawiki.legacy/wikibits.js',
-		'targets' => [ 'desktop', 'mobile' ],
-	],
 
 	/* MediaWiki UI */
 
@@ -2759,6 +2775,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' => [