wikimedia/mediawiki-extensions-TemplateData
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TemplateData synced 2024-09-24 10:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly detect if jquery.uls.data is loaded

Browse source 
Fix onResourceLoaderRegisterModules() to
check if the jquery.uls.data module is already
loaded in the ResourceLoader.

Modify comment to indicate that VE also
loads this module.

Bug: T85733
Change-Id: Idd459555312879a85a0a56fba651f609b4f9a52a
This commit is contained in:
Marielle Volz 2015-01-03 17:24:29 +00:00
parent 46d793f0f0
commit f940a0707b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
TemplateData.hooks.php
View file

@ -42,15 +42,16 @@ class TemplateDataHooks {
}
/**
* Conditionally register the jquery.uls.data module, in case they've already
* been registered by the UniversalLanguageSelector extension.
* Conditionally register the jquery.uls.data module, in case they've already been
* registered by the UniversalLanguageSelector extension or the VisualEditor extension.
*
* @param ResourceLoader $resourceLoader
* @return boolean true
*/
public static function onResourceLoaderRegisterModules( ResourceLoader &$resourceLoader ) {
$resourceModules = $resourceLoader->getConfig()->get( 'ResourceModules' );
if ( !isset( $resourceModules['jquery.uls.data'] ) ) {
$name = 'jquery.uls.data';
if ( !isset( $resourceModules[$name] ) && !$resourceLoader->getModule( $name ) ) {
$resourceLoader->register( array(
'jquery.uls.data' => array(
'localBasePath' => __DIR__,