Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/124283
Change subject: Register ResourceLoader modules the conventional way ...................................................................... Register ResourceLoader modules the conventional way * Remove $moduleInfo trick; it's an expensive way to save typing a few characters. (If you are really keen to save those characters, consider flattening the file hierarchy: does every mmv module have to have 'mmv' both in its directory name *and* in the filename itself?) * Using an anonymous, immediate function to create a scope and thereby avoid polluting global scope is a JavaScript pattern that doesn't translate well to PHP. The idiomatic way of doing that in PHP is to use namespaces. But you don't even need to do that, since all the variables you are manipulating are global anyway, now that $moduleInfo is gone. * Use the same pattern as VisualEditor for registering multiple modules in bulk. * Always put extension info under 'other' section. If a value is configurable, then it is not essential / inherent to the extension itself. The fact that the extension is a beta feature is a property of the way it is deployed on the Wikimedia cluster; it's not descriptive of the extension in itself. (I would argue getting rid of the 'betafeatures' section everywhere for this reason.) Change-Id: Ifc0a05362db990e4c073761a00ba17326c5ebbdb --- M MultimediaViewer.php 1 file changed, 238 insertions(+), 252 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/83/124283/1 diff --git a/MultimediaViewer.php b/MultimediaViewer.php index 177e81d..4053d5f 100644 --- a/MultimediaViewer.php +++ b/MultimediaViewer.php @@ -20,58 +20,50 @@ * @author Mark Holmquist <[email protected]> * @copyright Copyright © 2013, Mark Holmquist */ +if ( !isset( $wgNetworkPerformanceSamplingFactor ) ) { + /** @var int|bool: If set, records image load network performance once per this many requests. False if unset. **/ + $wgNetworkPerformanceSamplingFactor = false; +} -// do not pollute global namespace -call_user_func( function() { - global $wgExtensionMessagesFiles, $wgResourceModules, $wgExtensionFunctions, $wgMediaViewerIsInBeta, - $wgAutoloadClasses, $wgHooks, $wgExtensionCredits, $wgNetworkPerformanceSamplingFactor, - $wgEnableMediaViewerForLoggedInUsersOnly, $wgDefaultUserOptions; +if ( !isset( $wgMediaViewerIsInBeta ) ) { + /** @var bool: If set, Media Viewer will try to use BetaFeatures. False if unset. **/ + $wgMediaViewerIsInBeta = false; +} - if ( !isset( $wgNetworkPerformanceSamplingFactor ) ) { - /** @var int|bool: If set, records image load network performance once per this many requests. False if unset. **/ - $wgNetworkPerformanceSamplingFactor = false; - } - - if ( !isset( $wgMediaViewerIsInBeta ) ) { - /** @var bool: If set, Media Viewer will try to use BetaFeatures. False if unset. **/ - $wgMediaViewerIsInBeta = false; - } - - if ( !isset( $wgEnableMediaViewerForLoggedInUsersOnly ) ) { - /** - * @var bool: If set, and $wgMediaViewerIsInBeta is unset, Media Viewer will be turned on for - * all logged-in users. False if unset. - */ - $wgEnableMediaViewerForLoggedInUsersOnly = false; - } - - $wgMessagesDirs['MultimediaViewer'] = __DIR__ . '/i18n'; - $wgExtensionMessagesFiles['MultimediaViewer'] = __DIR__ . '/MultimediaViewer.i18n.php'; - +if ( !isset( $wgEnableMediaViewerForLoggedInUsersOnly ) ) { /** - * @param string $path - * @return array + * @var bool: If set, and $wgMediaViewerIsInBeta is unset, Media Viewer will be turned on for + * all logged-in users. False if unset. */ - $moduleInfo = function( $path ) { - return array( - 'localBasePath' => __DIR__ . "/resources/$path", - 'remoteExtPath' => "MultimediaViewer/resources/$path", - ); - }; + $wgEnableMediaViewerForLoggedInUsersOnly = false; +} - $wgResourceModules['mmv.lightboximage'] = array_merge( array( +$wgMessagesDirs['MultimediaViewer'] = __DIR__ . '/i18n'; +$wgExtensionMessagesFiles['MultimediaViewer'] = __DIR__ . '/MultimediaViewer.i18n.php'; + +/** + * @param string $path + * @return array + */ +$wgMediaViewerResourceTemplate = array( + 'localBasePath' => __DIR__ . '/resources', + 'remoteExtPath' => 'MultimediaViewer/resources', +); + +$wgResourceModules += array( + 'mmv.lightboximage' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.lightboximage.js', + 'mmv/mmv.lightboximage.js', ), 'dependencies' => array( 'mmv.base', ), - ), $moduleInfo( 'mmv' ) ); + ), - $wgResourceModules['mmv.lightboxinterface'] = array_merge( array( + 'mmv.lightboxinterface' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.lightboxinterface.js', + 'mmv/mmv.lightboxinterface.js', ), 'styles' => array( @@ -88,11 +80,11 @@ 'mmv.ui.fileUsage', 'mmv.ui.metadataPanel', ), - ), $moduleInfo( 'mmv' ) ); + ), - $wgResourceModules['mmv.ThumbnailWidthCalculator'] = array_merge( array( + 'mmv.ThumbnailWidthCalculator' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ThumbnailWidthCalculator.js', + 'mmv/mmv.ThumbnailWidthCalculator.js', ), 'dependencies' => array( @@ -100,132 +92,132 @@ 'mmv.base', 'mmv.model.ThumbnailWidth', ), - ), $moduleInfo( 'mmv' ) ); + ), - $wgResourceModules['mmv.HtmlUtils'] = array_merge( array( + 'mmv.HtmlUtils' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.HtmlUtils.js', + 'mmv/mmv.HtmlUtils.js', ), 'dependencies' => array( 'mmv.base', ), - ), $moduleInfo( 'mmv' ) ); + ), - $wgResourceModules['mmv.model'] = array_merge( array( + 'mmv.model' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.model.js', + 'mmv/model/mmv.model.js', ), 'dependencies' => array( 'mmv.base', 'oojs', ), - ), $moduleInfo( 'mmv/model' ) ); + ), - $wgResourceModules['mmv.model.EmbedFileInfo'] = array_merge( array( + 'mmv.model.EmbedFileInfo' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.model.EmbedFileInfo.js', + 'mmv/model/mmv.model.EmbedFileInfo.js', ), 'dependencies' => array( 'mmv.model', ), - ), $moduleInfo( 'mmv/model' ) ); + ), - $wgResourceModules['mmv.model.License'] = array_merge( array( + 'mmv.model.License' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.model.License.js', + 'mmv/model/mmv.model.License.js', ), 'dependencies' => array( 'mmv.model', 'mmv.HtmlUtils', ), - ), $moduleInfo( 'mmv/model' ) ); + ), - $wgResourceModules['mmv.model.FileUsage'] = array_merge( array( + 'mmv.model.FileUsage' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.model.FileUsage.js', + 'mmv/model/mmv.model.FileUsage.js', ), 'dependencies' => array( 'mmv.model', ), - ), $moduleInfo( 'mmv/model' ) ); + ), - $wgResourceModules['mmv.model.Image'] = array_merge( array( + 'mmv.model.Image' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.model.Image.js', + 'mmv/model/mmv.model.Image.js', ), 'dependencies' => array( 'mmv.model', 'mmv.model.License', ), - ), $moduleInfo( 'mmv/model' ) ); + ), - $wgResourceModules['mmv.model.Repo'] = array_merge( array( + 'mmv.model.Repo' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.model.Repo.js', + 'mmv/model/mmv.model.Repo.js', ), 'dependencies' => array( 'mmv.model', 'oojs', ), - ), $moduleInfo( 'mmv/model' ) ); + ), - $wgResourceModules['mmv.model.Thumbnail'] = array_merge( array( + 'mmv.model.Thumbnail' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.model.Thumbnail.js', + 'mmv/model/mmv.model.Thumbnail.js', ), 'dependencies' => array( 'mmv.model', ), - ), $moduleInfo( 'mmv/model' ) ); + ), - $wgResourceModules['mmv.model.ThumbnailWidth'] = array_merge( array( + 'mmv.model.ThumbnailWidth' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.model.ThumbnailWidth.js', + 'mmv/model/mmv.model.ThumbnailWidth.js', ), 'dependencies' => array( 'mmv.model', ), - ), $moduleInfo( 'mmv/model' ) ); + ), - $wgResourceModules['mmv.model.User'] = array_merge( array( + 'mmv.model.User' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.model.User.js', + 'mmv/model/mmv.model.User.js', ), 'dependencies' => array( 'mmv.model', ), - ), $moduleInfo( 'mmv/model' ) ); + ), - $wgResourceModules['mmv.model.TaskQueue'] = array_merge( array( + 'mmv.model.TaskQueue' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.model.TaskQueue.js', + 'mmv/model/mmv.model.TaskQueue.js', ), 'dependencies' => array( 'mmv.model', ), - ), $moduleInfo( 'mmv/model' ) ); + ), - $wgResourceModules['mmv.provider'] = array_merge( array( + 'mmv.provider' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.provider.Api.js', - 'mmv.provider.ImageUsage.js', - 'mmv.provider.GlobalUsage.js', - 'mmv.provider.ImageInfo.js', - 'mmv.provider.FileRepoInfo.js', - 'mmv.provider.ThumbnailInfo.js', - 'mmv.provider.UserInfo.js', - 'mmv.provider.Image.js', + 'mmv/provider/mmv.provider.Api.js', + 'mmv/provider/mmv.provider.ImageUsage.js', + 'mmv/provider/mmv.provider.GlobalUsage.js', + 'mmv/provider/mmv.provider.ImageInfo.js', + 'mmv/provider/mmv.provider.FileRepoInfo.js', + 'mmv/provider/mmv.provider.ThumbnailInfo.js', + 'mmv/provider/mmv.provider.UserInfo.js', + 'mmv/provider/mmv.provider.Image.js', ), 'dependencies' => array( @@ -239,17 +231,17 @@ 'mmv.performance', 'oojs', ), - ), $moduleInfo( 'mmv/provider' ) ); + ), - $wgResourceModules['mmv.base'] = array_merge( array( + 'mmv.base' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.base.js', + 'mmv/mmv.base.js', ), - ), $moduleInfo( 'mmv' ) ); + ), - $wgResourceModules['mmv.ui'] = array_merge( array( + 'mmv.ui' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ui.js', + 'mmv/ui/mmv.ui.js', ), 'styles' => array( @@ -259,11 +251,11 @@ 'dependencies' => array( 'mmv.base', ), - ), $moduleInfo( 'mmv/ui' ) ); + ), - $wgResourceModules['mmv.ui.canvas'] = array_merge( array( + 'mmv.ui.canvas' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ui.canvas.js', + 'mmv/ui/mmv.ui.canvas.js', ), 'styles' => array( @@ -279,11 +271,11 @@ 'mmv.ThumbnailWidthCalculator', 'oojs', ), - ), $moduleInfo( 'mmv/ui' ) ); + ), - $wgResourceModules['mmv.ui.categories'] = array_merge( array( + 'mmv.ui.categories' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ui.categories.js', + 'mmv/ui/mmv.ui.categories.js', ), 'styles' => array( @@ -298,11 +290,11 @@ 'messages' => array( 'comma-separator', ), - ), $moduleInfo( 'mmv/ui' ) ); + ), - $wgResourceModules['mmv.ui.stripeButtons'] = array_merge( array( + 'mmv.ui.stripeButtons' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ui.stripeButtons.js', + 'mmv/ui/mmv.ui.stripeButtons.js', ), 'styles' => array( @@ -323,11 +315,11 @@ 'multimediaviewer-description-page-popup-text-local', 'multimediaviewer-reuse-link', ), - ), $moduleInfo( 'mmv/ui' ) ); + ), - $wgResourceModules['mmv.ui.description'] = array_merge( array( + 'mmv.ui.description' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ui.description.js', + 'mmv/ui/mmv.ui.description.js', ), 'dependencies' => array( @@ -335,11 +327,11 @@ 'mmv.HtmlUtils', 'oojs', ), - ), $moduleInfo( 'mmv/ui' ) ); + ), - $wgResourceModules['mmv.ui.fileUsage'] = array_merge( array( + 'mmv.ui.fileUsage' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ui.fileUsage.js', + 'mmv/ui/mmv.ui.fileUsage.js', ), 'styles' => array( @@ -361,11 +353,11 @@ 'multimediaviewer-fileusage-local-section', 'multimediaviewer-fileusage-global-section', ), - ), $moduleInfo( 'mmv/ui' ) ); + ), - $wgResourceModules['mmv.ui.permission'] = array_merge( array( + 'mmv.ui.permission' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ui.permission.js', + 'mmv/ui/mmv.ui.permission.js', ), 'styles' => array( @@ -384,11 +376,11 @@ 'mmv.HtmlUtils', 'oojs', ), - ), $moduleInfo( 'mmv/ui' ) ); + ), - $wgResourceModules['mmv.ui.metadataPanel'] = array_merge( array( + 'mmv.ui.metadataPanel' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ui.metadataPanel.js', + 'mmv/ui/mmv.ui.metadataPanel.js', ), 'styles' => array( @@ -436,11 +428,11 @@ 'multimediaviewer-metadata-error', ), - ), $moduleInfo( 'mmv/ui' ) ); + ), - $wgResourceModules['mmv.embedFileFormatter'] = array_merge( array( + 'mmv.embedFileFormatter' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.EmbedFileFormatter.js', + 'mmv/mmv.EmbedFileFormatter.js', ), 'dependencies' => array( @@ -460,11 +452,11 @@ 'multimediaviewer-html-embed-credit-text-ts', 'multimediaviewer-html-embed-credit-text-tl', ), - ), $moduleInfo( 'mmv' ) ); + ), - $wgResourceModules['mmv.ui.reuse.dialog'] = array_merge( array( + 'mmv.ui.reuse.dialog' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ui.reuse.dialog.js', + 'mmv/ui/mmv.ui.reuse.dialog.js', ), 'styles' => array( @@ -479,11 +471,11 @@ 'mmv.ui.reuse.embed', 'mmv.ui.reuse.download', ), - ), $moduleInfo( 'mmv/ui' ) ); + ), - $wgResourceModules['mmv.ui.reuse.utils'] = array_merge( array( + 'mmv.ui.reuse.utils' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ui.reuse.utils.js', + 'mmv/ui/mmv.ui.reuse.utils.js', ), 'dependencies' => array( @@ -492,22 +484,22 @@ 'oojs', 'oojs-ui', ), - ), $moduleInfo( 'mmv/ui' ) ); + ), - $wgResourceModules['mmv.ui.reuse.tab'] = array_merge( array( + 'mmv.ui.reuse.tab' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ui.reuse.tab.js', + 'mmv/ui/mmv.ui.reuse.tab.js', ), 'dependencies' => array( 'mmv.ui', 'oojs', ), - ), $moduleInfo( 'mmv/ui' ) ); + ), - $wgResourceModules['mmv.ui.reuse.share'] = array_merge( array( + 'mmv.ui.reuse.share' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ui.reuse.share.js', + 'mmv/ui/mmv.ui.reuse.share.js', ), 'styles' => array( @@ -530,11 +522,11 @@ 'multimediaviewer-link-to-file', 'multimediaviewer-link-to-page', ), - ), $moduleInfo( 'mmv/ui' ) ); + ), - $wgResourceModules['mmv.ui.reuse.embed'] = array_merge( array( + 'mmv.ui.reuse.embed' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ui.reuse.embed.js', + 'mmv/ui/mmv.ui.reuse.embed.js', ), 'styles' => array( @@ -570,11 +562,11 @@ 'multimediaviewer-embed-dimensions', 'multimediaviewer-embed-dimensions-separated', ), - ), $moduleInfo( 'mmv/ui' ) ); + ), - $wgResourceModules['mmv.ui.reuse.download'] = array_merge( array( + 'mmv.ui.reuse.download' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ui.reuse.download.js', + 'mmv/ui/mmv.ui.reuse.download.js', ), 'styles' => array( @@ -598,11 +590,11 @@ 'multimediaviewer-embed-dimensions', 'multimediaviewer-embed-dimensions-with-file-format', ), - ), $moduleInfo( 'mmv/ui' ) ); + ), - $wgResourceModules['mmv.ui.canvasButtons'] = array_merge( array( + 'mmv.ui.canvasButtons' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.ui.canvasButtons.js', + 'mmv/ui/mmv.ui.canvasButtons.js', ), 'styles' => array( @@ -613,31 +605,31 @@ 'mmv.ui', 'oojs', ), - ), $moduleInfo( 'mmv/ui' ) ); + ), - $wgResourceModules['mmv.logger'] = array_merge( array( + 'mmv.logger' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.logger.js', + 'mmv/mmv.logger.js', ), 'dependencies' => array( 'mmv.base', ), - ), $moduleInfo( 'mmv' ) ); + ), - $wgResourceModules['mmv.performance'] = array_merge( array( + 'mmv.performance' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.performance.js', + 'mmv/mmv.performance.js', ), 'dependencies' => array( 'mmv.base', ), - ), $moduleInfo( 'mmv' ) ); + ), - $wgResourceModules['mmv.api'] = array_merge( array( + 'mmv.api' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.api.js', + 'mmv/mmv.api.js', ), 'dependencies' => array( @@ -645,11 +637,11 @@ 'mmv.base', 'oojs', ), - ), $moduleInfo( 'mmv' ) ); + ), - $wgResourceModules['mmv'] = array_merge( array( + 'mmv' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.js', + 'mmv/mmv.js', ), 'styles' => array( @@ -676,11 +668,11 @@ 'multimediaviewer-file-page', 'multimediaviewer-desc-nil', ), - ), $moduleInfo( 'mmv' ) ); + ), - $wgResourceModules['mmv.bootstrap'] = array_merge( array( + 'mmv.bootstrap' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.bootstrap.js', + 'mmv/mmv.bootstrap.js', ), 'styles' => array( @@ -693,22 +685,22 @@ 'mmv.logger', 'mmv.HtmlUtils', ), - ), $moduleInfo( 'mmv' ) ); + ), - $wgResourceModules['mmv.bootstrap.autostart'] = array_merge( array( + 'mmv.bootstrap.autostart' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.bootstrap.autostart.js', + 'mmv/mmv.bootstrap.autostart.js', ), 'dependencies' => array( 'mmv.base', 'mmv.bootstrap', ), - ), $moduleInfo( 'mmv' ) ); + ), - $wgResourceModules['mmv.head'] = array_merge( array( + 'mmv.head' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'mmv.head.js', + 'mmv/mmv.head.js', ), 'dependencies' => array( @@ -716,116 +708,110 @@ ), 'position' => 'top', - ), $moduleInfo( 'mmv' ) ); + ), - $wgResourceModules['jquery.scrollTo'] = array_merge( array( + 'jquery.scrollTo' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'jquery.scrollTo.js', + 'jquery.scrollTo/jquery.scrollTo.js', ), - ), $moduleInfo( 'jquery.scrollTo' ) ); + ), - $wgResourceModules['jquery.hashchange'] = array_merge( array( + 'jquery.hashchange' => $wgMediaViewerResourceTemplate + array( 'scripts' => array( - 'jquery.hashchange.js', + 'jquery.hashchange/jquery.hashchange.js', ), - ), $moduleInfo( 'jquery.hashchange' ) ); + ), +); - $wgExtensionFunctions[] = function () { - global $wgResourceModules; +$wgExtensionFunctions[] = function () { + global $wgResourceModules; - if ( isset( $wgResourceModules['ext.eventLogging'] ) ) { - $wgResourceModules['schema.MediaViewer'] = array( - 'class' => 'ResourceLoaderSchemaModule', - 'schema' => 'MediaViewer', - 'revision' => 7670440, - ); + if ( isset( $wgResourceModules['ext.eventLogging'] ) ) { + $wgResourceModules['schema.MediaViewer'] = array( + 'class' => 'ResourceLoaderSchemaModule', + 'schema' => 'MediaViewer', + 'revision' => 7670440, + ); - $wgResourceModules['schema.MultimediaViewerNetworkPerformance'] = array( - 'class' => 'ResourceLoaderSchemaModule', - 'schema' => 'MultimediaViewerNetworkPerformance', - 'revision' => 7917896, - ); + $wgResourceModules['schema.MultimediaViewerNetworkPerformance'] = array( + 'class' => 'ResourceLoaderSchemaModule', + 'schema' => 'MultimediaViewerNetworkPerformance', + 'revision' => 7917896, + ); - $wgResourceModules['mmv.logger']['dependencies'][] = 'ext.eventLogging'; - $wgResourceModules['mmv.logger']['dependencies'][] = 'schema.MediaViewer'; + $wgResourceModules['mmv.logger']['dependencies'][] = 'ext.eventLogging'; + $wgResourceModules['mmv.logger']['dependencies'][] = 'schema.MediaViewer'; - $wgResourceModules['mmv.performance']['dependencies'][] = 'ext.eventLogging'; - $wgResourceModules['mmv.performance']['dependencies'][] = 'schema.MultimediaViewerNetworkPerformance'; - } - }; - - $licenses = array( - 'cc-by-1.0', - 'cc-sa-1.0', - 'cc-by-sa-1.0', - 'cc-by-2.0', - 'cc-by-sa-2.0', - 'cc-by-2.1', - 'cc-by-sa-2.1', - 'cc-by-2.5', - 'cc-by-sa-2.5', - 'cc-by-3.0', - 'cc-by-sa-3.0', - 'cc-by-sa-3.0-migrated', - 'cc-by-4.0', - 'cc-by-sa-4.0', - 'cc-pd', - 'cc-zero', - 'pd', - 'default', - ); - - foreach ( $licenses as $license ) { - $wgResourceModules['mmv']['messages'][] = 'multimediaviewer-license-' . $license; + $wgResourceModules['mmv.performance']['dependencies'][] = 'ext.eventLogging'; + $wgResourceModules['mmv.performance']['dependencies'][] = 'schema.MultimediaViewerNetworkPerformance'; } +}; - $wgAutoloadClasses['MultimediaViewerHooks'] = __DIR__ . '/MultimediaViewerHooks.php'; +$licenses = array( + 'cc-by-1.0', + 'cc-sa-1.0', + 'cc-by-sa-1.0', + 'cc-by-2.0', + 'cc-by-sa-2.0', + 'cc-by-2.1', + 'cc-by-sa-2.1', + 'cc-by-2.5', + 'cc-by-sa-2.5', + 'cc-by-3.0', + 'cc-by-sa-3.0', + 'cc-by-sa-3.0-migrated', + 'cc-by-4.0', + 'cc-by-sa-4.0', + 'cc-pd', + 'cc-zero', + 'pd', + 'default', +); - $wgDefaultUserOptions['multimediaviewer-enable'] = true; +foreach ( $licenses as $license ) { + $wgResourceModules['mmv']['messages'][] = 'multimediaviewer-license-' . $license; +} - $wgHooks['GetPreferences'][] = 'MultimediaViewerHooks::getPreferences'; - $wgHooks['GetBetaFeaturePreferences'][] = 'MultimediaViewerHooks::getBetaPreferences'; - $wgHooks['BeforePageDisplay'][] = 'MultimediaViewerHooks::getModulesForArticle'; - $wgHooks['CategoryPageView'][] = 'MultimediaViewerHooks::getModulesForCategory'; - $wgHooks['ResourceLoaderGetConfigVars'][] = 'MultimediaViewerHooks::resourceLoaderGetConfigVars'; - $wgHooks['MakeGlobalVariablesScript'][] = 'MultimediaViewerHooks::makeGlobalVariablesScript'; - $wgHooks['ResourceLoaderTestModules'][] = 'MultimediaViewerHooks::getTestModules'; - $wgHooks['ThumbnailBeforeProduceHTML'][] = 'MultimediaViewerHooks::thumbnailBeforeProduceHTML'; +$wgAutoloadClasses['MultimediaViewerHooks'] = __DIR__ . '/MultimediaViewerHooks.php'; - $section = 'other'; +$wgDefaultUserOptions['multimediaviewer-enable'] = true; - if ( $wgMediaViewerIsInBeta ) { - $section = 'betafeatures'; - } +$wgHooks['GetPreferences'][] = 'MultimediaViewerHooks::getPreferences'; +$wgHooks['GetBetaFeaturePreferences'][] = 'MultimediaViewerHooks::getBetaPreferences'; +$wgHooks['BeforePageDisplay'][] = 'MultimediaViewerHooks::getModulesForArticle'; +$wgHooks['CategoryPageView'][] = 'MultimediaViewerHooks::getModulesForCategory'; +$wgHooks['ResourceLoaderGetConfigVars'][] = 'MultimediaViewerHooks::resourceLoaderGetConfigVars'; +$wgHooks['MakeGlobalVariablesScript'][] = 'MultimediaViewerHooks::makeGlobalVariablesScript'; +$wgHooks['ResourceLoaderTestModules'][] = 'MultimediaViewerHooks::getTestModules'; +$wgHooks['ThumbnailBeforeProduceHTML'][] = 'MultimediaViewerHooks::thumbnailBeforeProduceHTML'; - $wgExtensionCredits[$section][] = array( - 'path' => __FILE__, - 'name' => 'MultimediaViewer', - 'descriptionmsg' => 'multimediaviewer-desc', - 'version' => '0.3.0', - 'author' => array( - 'MarkTraceur (Mark Holmquist)', - 'Gilles Dubuc', - 'Gergő Tisza', - 'Aaron Arcos', - 'Zeljko Filipin', - 'Pau Giner', - 'theopolisme', - 'MatmaRex', - 'apsdehal', - 'vldandrew', - 'Ebrahim Byagowi', - 'Dereckson', - 'Brion VIBBER', - 'Yuki Shira', - 'Yaroslav Melnychuk', - 'tonythomas01', - 'Raimond Spekking', - 'Kunal Mehta', - 'Jeff Hall', - 'Christian Aistleitner', - 'Amir E. Aharoni', - ), - 'url' => 'https://mediawiki.org/wiki/Extension:MultimediaViewer', - ); -} ); +$wgExtensionCredits['other'][] = array( + 'path' => __FILE__, + 'name' => 'MultimediaViewer', + 'descriptionmsg' => 'multimediaviewer-desc', + 'version' => '0.3.0', + 'author' => array( + 'MarkTraceur (Mark Holmquist)', + 'Gilles Dubuc', + 'Gergő Tisza', + 'Aaron Arcos', + 'Zeljko Filipin', + 'Pau Giner', + 'theopolisme', + 'MatmaRex', + 'apsdehal', + 'vldandrew', + 'Ebrahim Byagowi', + 'Dereckson', + 'Brion VIBBER', + 'Yuki Shira', + 'Yaroslav Melnychuk', + 'tonythomas01', + 'Raimond Spekking', + 'Kunal Mehta', + 'Jeff Hall', + 'Christian Aistleitner', + 'Amir E. Aharoni', + ), + 'url' => 'https://mediawiki.org/wiki/Extension:MultimediaViewer', +); -- To view, visit https://gerrit.wikimedia.org/r/124283 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc0a05362db990e4c073761a00ba17326c5ebbdb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Ori.livneh <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
