X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=resources%2FResources.php;h=1edfdd3eb7c2086697fcbc0ff4fbcd1a8b686486;hb=d3a4ac1bb6accbaf3be0c0067358b64184a03490;hp=d62f3e3c545c877432cf854a6a73de316de61f22;hpb=ae506d2441d5cc15b7fa67974bfb2237f389e732;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/Resources.php b/resources/Resources.php
index d62f3e3c54..1edfdd3eb7 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -914,9 +914,15 @@ return [
 		],
 	],
 	'mediawiki.diff.styles' => [
+		// FIXME: Remove class and lessMessages
+		// when I6aad563e48f41c783df8b176a4f437e60a1255cc has
+		// been in production for 1 week.
 		'class' => ResourceLoaderLessVarFileModule::class,
 		'styles' => [
-			'resources/src/mediawiki.diff.styles/header.less',
+			// Remove resources/src/mediawiki.interface.helpers.styles.less
+			// when I6aad563e48f41c783df8b176a4f437e60a1255cc has
+			// been in production for 1 week.
+			'resources/src/mediawiki.interface.helpers.styles.less',
 			'resources/src/mediawiki.diff.styles/diff.css',
 			'resources/src/mediawiki.diff.styles/print.css' => [
 				'media' => 'print'
@@ -925,6 +931,7 @@ return [
 		'lessMessages' => [
 			'parentheses-start',
 			'parentheses-end',
+			'pipe-separator'
 		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
@@ -1184,7 +1191,7 @@ return [
 		'remoteBasePath' => "$wgResourceBasePath/resources/src",
 		'packageFiles' => [
 			'mediawiki.ForeignStructuredUpload.js',
-			'config.json' => [ 'config' => [ 'UploadDialog' ] ],
+			[ 'name' => 'config.json', 'config' => [ 'UploadDialog' ] ],
 		],
 		'dependencies' => [
 			'mediawiki.ForeignUpload',
@@ -1317,6 +1324,9 @@ return [
 		'dependencies' => [
 			'mediawiki.api',
 			'mediawiki.storage',
+			// The two user.* modules are not used by mediawiki.user itself,
+			// but kept as explicit dependencies because they provide part
+			// of the mw.user API that consumers of this module expect.
 			'user.options',
 			'user.tokens',
 		],
@@ -1334,7 +1344,7 @@ return [
 		'remoteBasePath' => "$wgResourceBasePath/resources/src",
 		'packageFiles' => [
 			'mediawiki.util.js',
-			'config.json' => [ 'config' => [ 'FragmentMode' ] ],
+			[ 'name' => 'config.json', 'config' => [ 'FragmentMode' ] ],
 		],
 		'dependencies' => [
 			'jquery.accessKeyLabel',
@@ -1581,7 +1591,7 @@ return [
 		'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.jqueryMsg",
 		'packageFiles' => [
 			'mediawiki.jqueryMsg.js',
-			'parserDefaults.json' => [ 'callback' => function ( ResourceLoaderContext $context ) {
+			[ 'name' => 'parserDefaults.json', 'callback' => function ( ResourceLoaderContext $context ) {
 				$tagData = Sanitizer::getRecognizedTagData();
 				$allowedHtmlElements = array_merge(
 					array_keys( $tagData['htmlpairs'] ),
@@ -1626,7 +1636,7 @@ return [
 		'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.language",
 		'packageFiles' => [
 			'mediawiki.language.names.js',
-			'names.json' => [ 'callback' => function ( ResourceLoaderContext $context ) {
+			[ 'name' => 'names.json', 'callback' => function ( ResourceLoaderContext $context ) {
 				return Language::fetchLanguageNames( $context->getLanguage(), 'all' );
 			} ],
 		],
@@ -1813,7 +1823,7 @@ return [
 			'dm/ItemModel.js',
 			'dm/SavedQueriesModel.js',
 			'dm/SavedQueryItemModel.js',
-			'config.json' => [ 'config' => [ 'StructuredChangeFiltersLiveUpdatePollingRate' ] ],
+			[ 'name' => 'config.json', 'config' => [ 'StructuredChangeFiltersLiveUpdatePollingRate' ] ],
 		],
 		'dependencies' => [
 			'mediawiki.String',
@@ -1867,7 +1877,7 @@ return [
 			'ui/RclTargetPageWidget.js',
 			'ui/RclToOrFromWidget.js',
 			'ui/WatchlistTopSectionWidget.js',
-			'config.json' => [ 'callback' => 'ChangesListSpecialPage::getRcFiltersConfigVars' ],
+			[ 'name' => 'config.json', 'callback' => 'ChangesListSpecialPage::getRcFiltersConfigVars' ],
 		],
 		'styles' => [
 			'styles/mw.rcfilters.mixins.less',
@@ -2007,6 +2017,20 @@ return [
 			'oojs-ui.styles.icons-media',
 		],
 	],
+	'mediawiki.interface.helpers.styles' => [
+		'class' => ResourceLoaderLessVarFileModule::class,
+		'lessMessages' => [
+			'parentheses-start',
+			'parentheses-end',
+			'pipe-separator'
+		],
+		'styles' => [
+			'resources/src/mediawiki.interface.helpers.styles.less',
+		],
+		'targets' => [
+			'desktop', 'mobile'
+		],
+	],
 	'mediawiki.special' => [
 		'styles' => [
 			'resources/src/mediawiki.special/special.less',
@@ -2122,20 +2146,28 @@ return [
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.special.changeslist' => [
+		// FIXME: Remove class and lessMessages
+		// when I6aad563e48f41c783df8b176a4f437e60a1255cc has
+		// been in production for 1 week.
 		'class' => ResourceLoaderLessVarFileModule::class,
 		'lessMessages' => [
 			'parentheses-start',
 			'parentheses-end',
 			'pipe-separator'
 		],
-		'styles' => 'resources/src/mediawiki.special.changeslist.less',
+		'styles' => [
+			// FIXME: Remove this line when I6aad563e48f41c783df8b176a4f437e60a1255cc has
+			// been in production for 1 week.
+			'resources/src/mediawiki.interface.helpers.styles.less',
+			'resources/src/mediawiki.special.changeslist.less',
+		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.special.changeslist.enhanced' => [
-		'styles' => 'resources/src/mediawiki.special.changeslist.enhanced.css',
+		'styles' => 'resources/src/mediawiki.special.changeslist.enhanced.less',
 	],
 	'mediawiki.special.changeslist.legend' => [
-		'styles' => 'resources/src/mediawiki.special.changeslist.legend.css',
+		'styles' => 'resources/src/mediawiki.special.changeslist.legend.less',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.special.changeslist.legend.js' => [
@@ -2359,6 +2391,7 @@ return [
 		'dependencies' => [
 			'mediawiki.api',
 			'mediawiki.jqueryMsg',
+			'mediawiki.notify',
 			'mediawiki.Title',
 			'mediawiki.util',
 			'oojs-ui-core',
@@ -2386,7 +2419,12 @@ return [
 		],
 	],
 	'mediawiki.legacy.protect' => [
-		'scripts' => 'resources/src/mediawiki.legacy/protect.js',
+		'localBasePath' => "$IP/resources/src/mediawiki.legacy",
+		'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.legacy",
+		'packageFiles' => [
+			'protect.js',
+			[ 'name' => 'config.json', 'config' => [ 'CascadingRestrictionLevels' ] ],
+		],
 		'dependencies' => 'jquery.lengthLimit',
 		'messages' => [ 'protect-unchain-permissions' ]
 	],