jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/379743 )
Change subject: Register plugin resource modules conditionally ...................................................................... Register plugin resource modules conditionally ... to avoid issues with WMF CI, like in https://integration.wikimedia.org/ci/job/mwext-testextension-hhvm-composer-jessie-non-voting/676/console Change-Id: Ie3b1f6416084b6dc56ed07a509ae5e7df0a65e9b --- M extension.json M includes/BlueSpiceExtendedFilelistHooks.php 2 files changed, 25 insertions(+), 7 deletions(-) Approvals: Mglaser: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index d77006a..bdbcffd 100755 --- a/extension.json +++ b/extension.json @@ -21,6 +21,7 @@ }, "Hooks": { "BSUserSidebarGlobalActionsWidgetGlobalActions": "BlueSpiceExtendedFilelistHooks::onBSUserSidebarGlobalActionsWidgetGlobalActions", + "ResourceLoaderRegisterModules": "BlueSpiceExtendedFilelistHooks::onResourceLoaderRegisterModules", "SpecialPage_initList": "BlueSpiceExtendedFilelistHooks::onSpecialPage_initList" }, "SpecialPages":{ @@ -34,12 +35,6 @@ "ext.bluespice.extjs", "ext.bluespice.upload", "ext.bluespice.extjs.filerepo" - ] - }, - "ext.bluespice.extendedFilelist.plugin.mmv": { - "scripts": "bluespice.extendedFilelist.plugin.mmv.js", - "dependencies": [ - "mmv.bootstrap" ] } }, diff --git a/includes/BlueSpiceExtendedFilelistHooks.php b/includes/BlueSpiceExtendedFilelistHooks.php index eb87e89..86b2e22 100644 --- a/includes/BlueSpiceExtendedFilelistHooks.php +++ b/includes/BlueSpiceExtendedFilelistHooks.php @@ -3,7 +3,7 @@ class BlueSpiceExtendedFilelistHooks { /** - * Adds link to "global actions" + * Adds link to 'global actions' * @param UserSidebar $oSender * @param User $oUser * @param array $aLinks @@ -37,4 +37,27 @@ } return true; } + + /** + * Conditionally register modules + * @param ResourceLoader $resourceLoader + * @return boolean + */ + public static function onResourceLoaderRegisterModules( &$resourceLoader ) { + $extPath = dirname( __DIR__ ); + if( $resourceLoader->isModuleRegistered( 'mmv.bootstrap' ) ) { + $resourceLoader->register( + 'ext.bluespice.extendedFilelist.plugin.mmv', + [ + 'scripts' => 'bluespice.extendedFilelist.plugin.mmv.js', + 'dependencies' => [ + 'mmv.bootstrap' + ], + 'localBasePath' => $extPath. '/resources', + 'remoteExtPath' => 'BlueSpiceExtendedFilelist/resources' + ] + ); + } + return true; + } } \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/379743 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie3b1f6416084b6dc56ed07a509ae5e7df0a65e9b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedFilelist Gerrit-Branch: master Gerrit-Owner: Robert Vogel <[email protected]> Gerrit-Reviewer: Ljonka <[email protected]> Gerrit-Reviewer: Mglaser <[email protected]> Gerrit-Reviewer: Pwirth <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
