jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351196 )
Change subject: extension.json: Remove no-op dependency on deprecated es5-shim
module
......................................................................
extension.json: Remove no-op dependency on deprecated es5-shim module
Preserve dependency for MediaWiki 1.27 and 1.28.
Bug: T162590
Change-Id: Ia77b8914e3b036b6d7d7bf886ba0e47be9aba0ed
---
M UniversalLanguageSelector.hooks.php
M extension.json
2 files changed, 34 insertions(+), 31 deletions(-)
Approvals:
TerraCodes: Looks good to me, but someone else must approve
jenkins-bot: Verified
Nikerabbit: Checked; Looks good to me, approved
diff --git a/UniversalLanguageSelector.hooks.php
b/UniversalLanguageSelector.hooks.php
index 0967a21..460d929 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -468,22 +468,42 @@
* @return boolean true
*/
public static function onResourceLoaderRegisterModules( ResourceLoader
$resourceLoader ) {
- global $wgULSEventLogging;
+ global $wgULSEventLogging, $wgVersion;
- if ( $wgULSEventLogging ) {
- $resourceLoader->register( [
- 'ext.uls.eventlogger' => [
- 'scripts' =>
'js/ext.uls.eventlogger.js',
- 'dependencies' => [
- 'mediawiki.user',
-
'schema.UniversalLanguageSelector',
- ],
- 'localBasePath' => __DIR__ .
'/resources',
- 'remoteExtPath' =>
'UniversalLanguageSelector/resources',
- ],
- ] );
+ $modules = [];
+ $modules['ext.uls.compactlinks'] = [
+ 'scripts' => 'js/ext.uls.compactlinks.js',
+ 'styles' => 'css/ext.uls.compactlinks.less',
+ 'dependencies' => [
+ 'mediawiki.jqueryMsg',
+ 'mediawiki.language',
+ 'mediawiki.ui.button',
+ 'ext.uls.init'
+ ],
+ 'messages' => [
+ 'ext-uls-compact-link-count',
+ 'ext-uls-compact-link-info'
+ ],
+ 'localBasePath' => __DIR__ . '/resources',
+ 'remoteExtPath' => 'UniversalLanguageSelector/resources'
+ ];
+ if ( version_compare( $wgVersion, '1.29', '<' ) ) {
+ // Support: MediaWiki 1.28 and earlier (T162590)
+ $modules['ext.uls.compactlinks']['dependencies'][] =
'es5-shim';
}
- return true;
+ if ( $wgULSEventLogging ) {
+ $modules['ext.uls.eventlogger'] = [
+ 'scripts' => 'js/ext.uls.eventlogger.js',
+ 'dependencies' => [
+ 'mediawiki.user',
+ 'schema.UniversalLanguageSelector',
+ ],
+ 'localBasePath' => __DIR__ . '/resources',
+ 'remoteExtPath' =>
'UniversalLanguageSelector/resources',
+ ];
+ }
+
+ $resourceLoader->register( $modules );
}
}
diff --git a/extension.json b/extension.json
index 9c7dbfe..aa4cb66 100644
--- a/extension.json
+++ b/extension.json
@@ -237,23 +237,6 @@
"localBasePath": "resources",
"remoteExtPath": "UniversalLanguageSelector/resources"
},
- "ext.uls.compactlinks": {
- "scripts": "js/ext.uls.compactlinks.js",
- "styles": "css/ext.uls.compactlinks.less",
- "dependencies": [
- "es5-shim",
- "mediawiki.jqueryMsg",
- "mediawiki.language",
- "mediawiki.ui.button",
- "ext.uls.init"
- ],
- "messages": [
- "ext-uls-compact-link-count",
- "ext-uls-compact-link-info"
- ],
- "localBasePath": "resources",
- "remoteExtPath": "UniversalLanguageSelector/resources"
- },
"ext.uls.webfonts": {
"scripts": "js/ext.uls.webfonts.js",
"dependencies": [
--
To view, visit https://gerrit.wikimedia.org/r/351196
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia77b8914e3b036b6d7d7bf886ba0e47be9aba0ed
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Fomafix <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: TerraCodes <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
