Addshore has submitted this change and it was merged.
Change subject: Reformat dynamic ResourceLoader::register calls for readability
......................................................................
Reformat dynamic ResourceLoader::register calls for readability
This patch does not change any semantics. It's pure refactoring. I'm
very sorry to say that, but I found the code extremely hard to read
and to understand. This is much more straightforward and much closer to
the existing code in all the other resource.php files. It uses the same
array() structure again. So to a certain degree this is a "revert" of
the formatting done in I4412f14.
Bug: T105211
Change-Id: I123e79fc9e689688b690ea5cd6fa699c873ed777
---
M lib/WikibaseLib.hooks.php
M repo/Wikibase.hooks.php
M view/init.mw.php
3 files changed, 65 insertions(+), 90 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/WikibaseLib.hooks.php b/lib/WikibaseLib.hooks.php
index 98e68c6..7f96dc9 100644
--- a/lib/WikibaseLib.hooks.php
+++ b/lib/WikibaseLib.hooks.php
@@ -62,7 +62,6 @@
public static function onResourceLoaderRegisterModules( ResourceLoader
$resourceLoader ) {
preg_match( '+' . preg_quote( DIRECTORY_SEPARATOR ) .
'(?:vendor|extensions)'
. preg_quote( DIRECTORY_SEPARATOR ) . '.*+', __DIR__,
$remoteExtPath );
- $hasULS = ExtensionRegistry::getInstance()->isLoaded(
'UniversalLanguageSelector' );
$moduleTemplate = array(
'localBasePath' => __DIR__,
@@ -70,26 +69,26 @@
'position' => 'top' // reducing the time between DOM
construction and JS initialisation
);
- $dependencies = array(
- 'mediawiki.util',
- 'util.inherit',
- 'wikibase',
- );
-
- if ( $hasULS ) {
- $dependencies[] = 'ext.uls.mediawiki';
- }
-
- $resourceLoader->register(
- 'wikibase.Site',
- $moduleTemplate + array(
+ $modules = array(
+ 'wikibase.Site' => $moduleTemplate + array(
'scripts' => array(
'resources/wikibase.Site.js',
),
- 'dependencies' => $dependencies,
- )
+ 'dependencies' => array(
+ 'mediawiki.util',
+ 'util.inherit',
+ 'wikibase',
+ ),
+ ),
);
+ $isUlsLoaded = ExtensionRegistry::getInstance()->isLoaded(
'UniversalLanguageSelector' );
+ if ( $isUlsLoaded ) {
+ $modules['wikibase.Site']['dependencies'][] =
'ext.uls.mediawiki';
+ }
+
+ $resourceLoader->register( $modules );
+
return true;
}
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index cb8037a..6660b92 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -1148,7 +1148,6 @@
public static function onResourceLoaderRegisterModules( ResourceLoader
$resourceLoader ) {
preg_match( '+' . preg_quote( DIRECTORY_SEPARATOR ) .
'(?:vendor|extensions)'
. preg_quote( DIRECTORY_SEPARATOR ) . '.*+', __DIR__,
$remoteExtPath );
- $hasULS = ExtensionRegistry::getInstance()->isLoaded(
'UniversalLanguageSelector' );
$moduleTemplate = array(
'localBasePath' => __DIR__,
@@ -1156,63 +1155,45 @@
'position' => 'top' // reducing the time between DOM
construction and JS initialisation
);
- $dependencies = array(
- 'util.ContentLanguages',
- 'util.inherit',
- 'wikibase',
- );
-
- if ( $hasULS ) {
- $dependencies[] = 'ext.uls.languagenames';
- }
-
- $resourceLoader->register(
- 'wikibase.WikibaseContentLanguages',
- $moduleTemplate + array(
+ $modules = array(
+ 'wikibase.WikibaseContentLanguages' => $moduleTemplate
+ array(
'scripts' => array(
'resources/wikibase.WikibaseContentLanguages.js',
),
- 'dependencies' => $dependencies
- )
+ 'dependencies' => array(
+ 'util.ContentLanguages',
+ 'util.inherit',
+ 'wikibase',
+ ),
+ ),
+ 'wikibase.special.itemDisambiguation' =>
$moduleTemplate + array(
+ 'scripts' => array(
+
'resources/wikibase.special/wikibase.special.itemDisambiguation.js',
+ ),
+ 'dependencies' => array(
+ 'wikibase.special',
+ 'jquery.ui.suggester',
+ ),
+ ),
+ 'wikibase.special.entitiesWithout' => $moduleTemplate +
array(
+ 'scripts' => array(
+
'resources/wikibase.special/wikibase.special.entitiesWithout.js',
+ ),
+ 'dependencies' => array(
+ 'wikibase.special',
+ 'jquery.ui.suggester',
+ ),
+ ),
);
- $dependencies = array(
- 'wikibase.special',
- 'jquery.ui.suggester'
- );
-
- if ( $hasULS ) {
- $dependencies[] = 'ext.uls.mediawiki';
+ $isUlsLoaded = ExtensionRegistry::getInstance()->isLoaded(
'UniversalLanguageSelector' );
+ if ( $isUlsLoaded ) {
+
$modules['wikibase.WikibaseContentLanguages']['dependencies'][] =
'ext.uls.languagenames';
+
$modules['wikibase.special.itemDisambiguation']['dependencies'][] =
'ext.uls.mediawiki';
+
$modules['wikibase.special.entitiesWithout']['dependencies'][] =
'ext.uls.mediawiki';
}
- $resourceLoader->register(
- 'wikibase.special.itemDisambiguation',
- $moduleTemplate + array(
- 'scripts' => array(
-
'resources/wikibase.special/wikibase.special.itemDisambiguation.js'
- ),
- 'dependencies' => $dependencies
- )
- );
-
- $dependencies = array(
- 'wikibase.special',
- 'jquery.ui.suggester'
- );
-
- if ( $hasULS ) {
- $dependencies[] = 'ext.uls.mediawiki';
- }
-
- $resourceLoader->register(
- 'wikibase.special.entitiesWithout',
- $moduleTemplate + array(
- 'scripts' => array(
-
'resources/wikibase.special/wikibase.special.entitiesWithout.js'
- ),
- 'dependencies' => $dependencies
- )
- );
+ $resourceLoader->register( $modules );
return true;
}
diff --git a/view/init.mw.php b/view/init.mw.php
index d29b830..aec7f11 100644
--- a/view/init.mw.php
+++ b/view/init.mw.php
@@ -33,7 +33,6 @@
$GLOBALS['wgHooks']['ResourceLoaderRegisterModules'][] = function(
ResourceLoader $resourceLoader ) {
preg_match( '+' . preg_quote( DIRECTORY_SEPARATOR ) .
'(?:vendor|extensions)'
. preg_quote( DIRECTORY_SEPARATOR ) . '.*+', __DIR__,
$remoteExtPath );
- $hasULS = ExtensionRegistry::getInstance()->isLoaded(
'UniversalLanguageSelector' );
$moduleTemplate = array(
'localBasePath' => __DIR__,
@@ -41,35 +40,31 @@
'position' => 'top' // reducing the time between DOM
construction and JS initialisation
);
- $dependencies = array();
- if ( $hasULS ) {
- $dependencies[] = 'ext.uls.mediawiki';
- }
-
- $resourceLoader->register(
- 'jquery.util.getDirectionality',
- $moduleTemplate + array(
+ $modules = array(
+ 'jquery.util.getDirectionality' => $moduleTemplate + array(
'scripts' => array(
'resources/jquery/jquery.util.getDirectionality.js',
),
- 'dependencies' => $dependencies
- )
+ 'dependencies' => array(
+ ),
+ ),
+ 'wikibase.getLanguageNameByCode' => $moduleTemplate + array(
+ 'scripts' => array(
+
'resources/wikibase/wikibase.getLanguageNameByCode.js',
+ ),
+ 'dependencies' => array(
+ 'wikibase',
+ ),
+ ),
);
- $dependencies = array( 'wikibase' );
- if ( $hasULS ) {
- $dependencies[] = 'ext.uls.mediawiki';
+ $isUlsLoaded = ExtensionRegistry::getInstance()->isLoaded(
'UniversalLanguageSelector' );
+ if ( $isUlsLoaded ) {
+ $modules['jquery.util.getDirectionality']['dependencies'][] =
'ext.uls.mediawiki';
+ $modules['wikibase.getLanguageNameByCode']['dependencies'][] =
'ext.uls.mediawiki';
}
- $resourceLoader->register(
- 'wikibase.getLanguageNameByCode',
- $moduleTemplate + array(
- 'scripts' => array(
-
'resources/wikibase/wikibase.getLanguageNameByCode.js'
- ),
- 'dependencies' => $dependencies
- )
- );
+ $resourceLoader->register( $modules );
return true;
};
--
To view, visit https://gerrit.wikimedia.org/r/224063
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I123e79fc9e689688b690ea5cd6fa699c873ed777
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
