bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "extension.json: Remove no-op dependency on deprecated es5-shim module"

Browse Source
This commit is contained in:
jenkins-bot
2017-05-10 11:07:21 +00:00
committed by Gerrit Code Review
parent 5959d28d44 1d9fec680b
commit f6fe486eb9
2 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
UniversalLanguageSelector.hooks.php
View File

@@ -468,22 +468,42 @@ class UniversalLanguageSelectorHooks {
* @return boolean true * @return boolean true
*/ */
public static function onResourceLoaderRegisterModules( ResourceLoader $resourceLoader ) { public static function onResourceLoaderRegisterModules( ResourceLoader $resourceLoader ) {
global $wgULSEventLogging; global $wgULSEventLogging, $wgVersion;
if ( $wgULSEventLogging ) { $modules = [];
$resourceLoader->register( [ $modules['ext.uls.compactlinks'] = [
'ext.uls.eventlogger' => [ 'scripts' => 'js/ext.uls.compactlinks.js',
'scripts' => 'js/ext.uls.eventlogger.js', 'styles' => 'css/ext.uls.compactlinks.less',
'dependencies' => [ 'dependencies' => [
'mediawiki.user', 'mediawiki.jqueryMsg',
'schema.UniversalLanguageSelector', 'mediawiki.language',
], 'mediawiki.ui.button',
'localBasePath' => __DIR__ . '/resources', 'ext.uls.init'
'remoteExtPath' => 'UniversalLanguageSelector/resources', ],
], '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 );
} }
} }

17
extension.json
View File

@@ -237,23 +237,6 @@
"localBasePath": "resources", "localBasePath": "resources",
"remoteExtPath": "UniversalLanguageSelector/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": { "ext.uls.webfonts": {
"scripts": "js/ext.uls.webfonts.js", "scripts": "js/ext.uls.webfonts.js",
"dependencies": [ "dependencies": [