X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=resources%2FResources.php;h=18a1b99e7f84082996a8a9c01a48eca9911ad66d;hb=395fa474f6cd5b7135f4dc780e14002bd49771c2;hp=9a5931f5f912ab7b41e728981d19b3f120dd6f24;hpb=f826f2f5f6facdce2c92dcb9e70bb0cf20ff9db0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/Resources.php b/resources/Resources.php
index 9a5931f5f9..18a1b99e7f 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -43,7 +43,11 @@ return [
 		'class' => 'ResourceLoaderWikiModule',
 		'styles' => [ 'MediaWiki:Filepage.css' ],
 	],
-	'user.groups' => [ 'class' => 'ResourceLoaderUserGroupsModule' ],
+	'user.groups' => [
+		// Merged into 'user' since MediaWiki 1.28 - kept for back-compat
+		'dependencies' => 'user',
+		'targets' => [ 'desktop', 'mobile' ],
+	],
 
 	// Scripts managed by the current user (stored in their user space)
 	'user' => [ 'class' => 'ResourceLoaderUserModule' ],
@@ -824,6 +828,9 @@ return [
 				'resources/src/moment-locale-overrides.js',
 			],
 		],
+		'dependencies' => [
+			'mediawiki.language',
+		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 
@@ -933,6 +940,12 @@ return [
 			'mediawiki.api',
 		],
 	],
+	'mediawiki.api.rollback' => [
+		'scripts' => 'resources/src/mediawiki/api/rollback.js',
+		'dependencies' => [
+			'mediawiki.api',
+		],
+	],
 	'mediawiki.content.json' => [
 		'position' => 'top',
 		'styles' => 'resources/src/mediawiki/mediawiki.content.json.css',
@@ -1050,14 +1063,17 @@ return [
 			// @todo Load this message in content language
 			'colon-separator',
 		],
+		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.htmlform.styles' => [
 		'styles' => 'resources/src/mediawiki/mediawiki.htmlform.css',
 		'position' => 'top',
+		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.htmlform.ooui.styles' => [
 		'styles' => 'resources/src/mediawiki/mediawiki.htmlform.ooui.css',
 		'position' => 'top',
+		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.icon' => [
 		'styles' => 'resources/src/mediawiki/mediawiki.icon.less',
@@ -1167,6 +1183,7 @@ return [
 		],
 		'messages' => [
 			'uploaddisabledtext',
+			'upload-dialog-disabled',
 			'upload-foreign-cant-upload',
 		]
 	],
@@ -1179,6 +1196,9 @@ return [
 			'mediawiki.ForeignUpload',
 			'mediawiki.ForeignStructuredUpload.config',
 		],
+		'messages' => [
+			'upload-foreign-cant-load-config',
+		],
 	],
 	'mediawiki.Upload.Dialog' => [
 		'scripts' => [
@@ -1360,11 +1380,9 @@ return [
 	],
 	'mediawiki.checkboxtoggle' => [
 		'scripts' => 'resources/src/mediawiki/mediawiki.checkboxtoggle.js',
-		'position' => 'top',
 	],
 	'mediawiki.checkboxtoggle.styles' => [
 		'styles' => 'resources/src/mediawiki/mediawiki.checkboxtoggle.css',
-		'position' => 'top',
 	],
 	'mediawiki.cookie' => [
 		'scripts' => 'resources/src/mediawiki/mediawiki.cookie.js',
@@ -1692,6 +1710,18 @@ return [
 			'watcherrortext',
 		],
 	],
+	'mediawiki.page.rollback' => [
+		'scripts' => 'resources/src/mediawiki/page/rollback.js',
+		'dependencies' => [
+			'mediawiki.api.rollback',
+			'mediawiki.notify',
+			'jquery.spinner',
+		],
+		'messages' => [
+			'rollbackfailed',
+			'actioncomplete',
+		],
+	],
 	'mediawiki.page.image.pagination' => [
 		'scripts' => 'resources/src/mediawiki/page/image-pagination.js',
 		'dependencies' => [
@@ -1704,7 +1734,6 @@ return [
 
 	'mediawiki.special' => [
 		'position' => 'top',
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.js',
 		'styles' => 'resources/src/mediawiki.special/mediawiki.special.css',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
@@ -1715,7 +1744,6 @@ return [
 		'styles' => 'resources/src/mediawiki.special/mediawiki.special.apisandbox.css',
 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.apisandbox.js',
 		'dependencies' => [
-			'mediawiki.special',
 			'mediawiki.api',
 			'mediawiki.jqueryMsg',
 			'oojs-ui',
@@ -1768,10 +1796,6 @@ return [
 		'styles' => 'resources/src/mediawiki.special/mediawiki.special.block.css',
 		'dependencies' => 'mediawiki.util',
 	],
-	'mediawiki.special.blocklist' => [
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.blocklist.css',
-		'position' => 'top',
-	],
 	'mediawiki.special.changeslist' => [
 		'position' => 'top',
 		'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.css',
@@ -1858,7 +1882,6 @@ return [
 	],
 	'mediawiki.special.recentchanges' => [
 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.recentchanges.js',
-		'dependencies' => 'mediawiki.special',
 		'position' => 'top',
 	],
 	'mediawiki.special.search' => [
@@ -1872,6 +1895,10 @@ return [
 			'powersearch-togglenone',
 		],
 	],
+	'mediawiki.special.search.styles' => [
+		'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.styles.css',
+		'targets' => [ 'desktop', 'mobile' ],
+	],
 	'mediawiki.special.undelete' => [
 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.undelete.js',
 	],
@@ -1880,7 +1907,6 @@ return [
 			'thumbnail.html' => 'resources/src/mediawiki.special/templates/thumbnail.html',
 		],
 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.upload.js',
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.upload.css',
 		'messages' => [
 			'widthheight',
 			'size-bytes',
@@ -1893,6 +1919,7 @@ return [
 			'prefs-editing',
 		],
 		'dependencies' => [
+			'mediawiki.special.upload.styles',
 			'jquery.spinner',
 			'mediawiki.jqueryMsg',
 			'mediawiki.api',
@@ -1903,6 +1930,9 @@ return [
 			'user.options',
 		],
 	],
+	'mediawiki.special.upload.styles' => [
+		'styles' => 'resources/src/mediawiki.special/mediawiki.special.upload.styles.css',
+	],
 	'mediawiki.special.userlogin.common.styles' => [
 		'styles' => [
 			'resources/src/mediawiki.special/mediawiki.special.userlogin.common.css',
@@ -2321,7 +2351,5 @@ return [
 	],
 
 	/* OOjs UI */
-	// WARNING: OOjs-UI is NOT TESTED with older browsers and is likely to break
-	// if loaded in browsers that don't support ES5
 	// @see ResourcesOOUI.php
 ];