From afcfc3290c32deb55d95bb69bd1e9dd164cb4f12 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Wed, 28 Oct 2015 03:24:40 +0000 Subject: [PATCH] resourceloader: Consistently refer to the framework as ResourceLoader Change-Id: Ia59e4eac9662723e80d62f7cfcb9e4292e3ee4de --- includes/DefaultSettings.php | 8 ++++---- includes/OutputPage.php | 18 ++++++++---------- includes/cache/MessageBlobStore.php | 6 +++--- includes/parser/ParserOutput.php | 8 +++----- .../DerivativeResourceLoaderContext.php | 2 +- .../resourceloader/ResourceLoaderContext.php | 2 +- .../ResourceLoaderEditToolbarModule.php | 2 +- .../ResourceLoaderFileModule.php | 2 +- .../ResourceLoaderImageModule.php | 4 ++-- .../ResourceLoaderLanguageDataModule.php | 2 +- .../ResourceLoaderLanguageNamesModule.php | 2 +- .../resourceloader/ResourceLoaderModule.php | 4 ++-- .../ResourceLoaderSiteModule.php | 2 +- .../ResourceLoaderSkinModule.php | 2 +- ...esourceLoaderSpecialCharacterDataModule.php | 4 ++-- .../ResourceLoaderStartUpModule.php | 2 +- .../ResourceLoaderUserCSSPrefsModule.php | 2 +- .../ResourceLoaderUserDefaultsModule.php | 2 +- .../ResourceLoaderUserGroupsModule.php | 2 +- .../ResourceLoaderUserModule.php | 2 +- .../ResourceLoaderUserOptionsModule.php | 2 +- .../ResourceLoaderUserTokensModule.php | 2 +- .../ResourceLoaderWikiModule.php | 4 ++-- load.php | 2 +- maintenance/archives/patch-msg_resource.sql | 2 +- maintenance/mssql/tables.sql | 2 +- maintenance/tables.sql | 2 +- .../GlobalFunctions/wfTimestampTest.php | 3 --- 28 files changed, 45 insertions(+), 52 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index c8da21eb91..e9169384c4 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -3397,14 +3397,14 @@ $wgMangleFlashPolicy = true; /** @} */ # End of output format settings } /*************************************************************************//** - * @name Resource loader settings + * @name ResourceLoader settings * @{ */ /** * Client-side resource modules. * - * Extensions should add their resource loader module definitions + * Extensions should add their ResourceLoader module definitions * to the $wgResourceModules variable. * * @par Example: @@ -3529,7 +3529,7 @@ $wgResourceLoaderSources = array(); $wgResourceBasePath = null; /** - * Maximum time in seconds to cache resources served by the resource loader. + * Maximum time in seconds to cache resources served by ResourceLoader. * Used to set last modified headers (max-age/s-maxage). * * Following options to distinguish: @@ -3736,7 +3736,7 @@ $wgResourceLoaderStorageVersion = 1; */ $wgAllowSiteCSSOnRestrictedPages = false; -/** @} */ # End of resource loader settings } +/** @} */ # End of ResourceLoader settings } /*************************************************************************//** * @name Page title and interwiki link settings diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 147527e54c..726fec1b84 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -50,7 +50,7 @@ class OutputPage extends ContextSource { /** * @var array Additional stylesheets. Looks like this is for extensions. - * Might be replaced by resource loader. + * Might be replaced by ResourceLoader. */ protected $mExtStyles = array(); @@ -132,7 +132,7 @@ class OutputPage extends ContextSource { private $mLanguageLinks = array(); /** - * Used for JavaScript (pre resource loader) + * Used for JavaScript (predates ResourceLoader) * @todo We should split JS / CSS. * mScripts content is inserted as is in "" by Skin. This might * contain either a link to a stylesheet or inline CSS. @@ -151,8 +151,6 @@ class OutputPage extends ContextSource { /** @var array Array of elements in "". Parser might add its own headers! */ protected $mHeadItems = array(); - // @todo FIXME: Next 5 variables probably come from the resource loader - /** @var array */ protected $mModules = array(); @@ -224,7 +222,7 @@ class OutputPage extends ContextSource { /** * @var bool Comes from the parser. This was probably made to load CSS/JS * only if we had "". Used directly in CategoryPage.php. - * Looks like resource loader can replace this. + * Looks like ResourceLoader can replace this. */ public $mNoGallery = false; @@ -568,8 +566,8 @@ class OutputPage extends ContextSource { } /** - * Add one or more modules recognized by the resource loader. Modules added - * through this function will be loaded by the resource loader when the + * Add one or more modules recognized by ResourceLoader. Modules added + * through this function will be loaded by ResourceLoader when the * page loads. * * @param string|array $modules Module name (string) or array of module names @@ -591,8 +589,8 @@ class OutputPage extends ContextSource { } /** - * Add only JS of one or more modules recognized by the resource loader. Module - * scripts added through this function will be loaded by the resource loader when + * Add only JS of one or more modules recognized by ResourceLoader. Module + * scripts added through this function will be loaded by ResourceLoader when * the page loads. * * @param string|array $modules Module name (string) or array of module names @@ -614,7 +612,7 @@ class OutputPage extends ContextSource { } /** - * Add only CSS of one or more modules recognized by the resource loader. + * Add only CSS of one or more modules recognized by ResourceLoader. * * Module styles added through this function will be added using standard link CSS * tags, rather than as a combined Javascript and CSS package. Thus, they will diff --git a/includes/cache/MessageBlobStore.php b/includes/cache/MessageBlobStore.php index b7c70c1e3f..6290eaea01 100644 --- a/includes/cache/MessageBlobStore.php +++ b/includes/cache/MessageBlobStore.php @@ -1,6 +1,6 @@