Robmoen has uploaded a new change for review. https://gerrit.wikimedia.org/r/232304
Change subject: WIP: Don't change wgResourceLoaderModules inside hook ...................................................................... WIP: Don't change wgResourceLoaderModules inside hook bug: T102708 Change-Id: Iba22cb403c84668c18d0d3a070ee2ad87722fe56 --- M includes/MobileFrontend.hooks.php M resources/mobile.loggingSchemas/init.js 2 files changed, 19 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/04/232304/1 diff --git a/includes/MobileFrontend.hooks.php b/includes/MobileFrontend.hooks.php index 861c0bc..07cd42a 100644 --- a/includes/MobileFrontend.hooks.php +++ b/includes/MobileFrontend.hooks.php @@ -896,7 +896,7 @@ * @return bool Always true */ public static function onResourceLoaderRegisterModules( ResourceLoader &$resourceLoader ) { - self::registerMobileLoggingSchemasModule(); + self::registerMobileLoggingSchemasModule( $resourceLoader ); $config = MobileContext::singleton()->getMFConfig(); // add VisualEditor related modules only, if VisualEditor seems to be installed - T85007 @@ -966,7 +966,6 @@ }, array_keys( $mobileEventLoggingSchemas ) ); - self::registerMobileLoggingSchemasModule( $additionalDependencies, true ); return true; } @@ -975,21 +974,11 @@ * Registers the mobile.loggingSchemas module with any additional * dependencies. * - * @param array $additionalDependencies Additional dependencies that the module - * depends on. Defaults to empty array - * @param boolean $overwrite Whether or not to re-register the module if it has - * already been registered. Defaults to false + * @param ResourceLoader &$resourceLoader The ResourceLoader object */ - private static function registerMobileLoggingSchemasModule( - $additionalDependencies = array(), - $overwrite = false - ) { + private static function registerMobileLoggingSchemasModule( $resourceLoader ) { // FIXME: Use Config object when setting of configuration values is possible. - global $wgResourceModules, $wgMFResourceFileModuleBoilerplate; - - if ( isset( $wgResourceModules['mobile.loggingSchemas'] ) && !$overwrite ) { - return; - } + global $wgMFResourceFileModuleBoilerplate; $scripts = array( 'resources/mobile.loggingSchemas/SchemaMobileWeb.js', @@ -1000,14 +989,16 @@ 'resources/mobile.loggingSchemas/SchemaMobileWebBrowse.js', ); - $wgResourceModules['mobile.loggingSchemas'] = $wgMFResourceFileModuleBoilerplate + array( - 'dependencies' => array_merge( $additionalDependencies, array( + $loggingSchemasModule = $wgMFResourceFileModuleBoilerplate + array( + 'dependencies' => array( 'mobile.startup', 'mobile.settings', - ) ), + ), 'scripts' => $scripts, ); + $resourceLoader->register( array( 'mobile.loggingSchemas' => $loggingSchemasModule ) ); + $wgResourceModules['skins.minerva.scripts'] ['scripts'][] = 'resources/mobile.loggingSchemas/init.js'; } diff --git a/resources/mobile.loggingSchemas/init.js b/resources/mobile.loggingSchemas/init.js index 6aafc71..88a0cae 100644 --- a/resources/mobile.loggingSchemas/init.js +++ b/resources/mobile.loggingSchemas/init.js @@ -23,4 +23,14 @@ uiSchema.hijackLink( $profileLink, 'lastmodified-profile' ); uiSchema.hijackLink( '.nearby-button', 'nearby-button' ); } ); + mw.loader.load( [ + 'schema.MobileWebBrowse', + 'schema.MobileWebDiffClickTracking', + 'schema.MobileWebEditing', + 'schema.MobileWebMainMenuClickTracking', + 'schema.MobileWebSearch', + 'schema.MobileWebUIClickTracking', + 'schema.MobileWebWatching', + 'schema.MobileWebWatchlistClickTracking', + ] ); } )( mw.mobileFrontend, jQuery ); -- To view, visit https://gerrit.wikimedia.org/r/232304 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba22cb403c84668c18d0d3a070ee2ad87722fe56 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Robmoen <rm...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits