From c6ebce6a7dff15431964aa3730cce4904ceaf2a3 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Thu, 25 Jul 2019 17:41:06 +0100 Subject: [PATCH] resourceloader: Remove internal 'wgResourceLoaderStorageEnabled' from mw.config Only needed internally by the startup module, which can export it through private means instead. Follows 0a8e37f042c2c and 30ddfc8a7721. Change-Id: I5e54bd51d9b47146e1ef9a64b14c1a00697bd6a9 --- .../resourceloader/ResourceLoaderStartUpModule.php | 6 +++++- resources/src/startup/mediawiki.js | 10 +++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php index 7880f6f249..f0ef25a5b7 100644 --- a/includes/resourceloader/ResourceLoaderStartUpModule.php +++ b/includes/resourceloader/ResourceLoaderStartUpModule.php @@ -105,7 +105,6 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { 'wgCaseSensitiveNamespaces' => $caseSensitiveNamespaces, 'wgLegalTitleChars' => Title::convertByteClassToUnicodeClass( Title::legalChars() ), 'wgIllegalFileChars' => Title::convertByteClassToUnicodeClass( $illegalFileChars ), - 'wgResourceLoaderStorageEnabled' => $conf->get( 'ResourceLoaderStorageEnabled' ), 'wgForeignUploadTargets' => $conf->get( 'ForeignUploadTargets' ), 'wgEnableUploads' => $conf->get( 'EnableUploads' ), 'wgCommentByteLimit' => null, @@ -422,6 +421,11 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { '$VARS.maxQueryLength' => ResourceLoader::encodeJsonForScript( $conf->get( 'ResourceLoaderMaxQueryLength' ) ), + // The client-side module cache can be disabled by site configuration. + // It is also always disabled in debug mode. + '$VARS.storeEnabled' => ResourceLoader::encodeJsonForScript( + $conf->get( 'ResourceLoaderStorageEnabled' ) && !$context->getDebug() + ), '$VARS.storeKey' => ResourceLoader::encodeJsonForScript( $this->getStoreKey() ), '$VARS.storeVary' => ResourceLoader::encodeJsonForScript( $this->getStoreVary( $context ) ), ]; diff --git a/resources/src/startup/mediawiki.js b/resources/src/startup/mediawiki.js index 2081bfe657..b2a8f5b42d 100644 --- a/resources/src/startup/mediawiki.js +++ b/resources/src/startup/mediawiki.js @@ -2180,16 +2180,12 @@ } if ( + !$VARS.storeEnabled || + // Disabled because localStorage quotas are tight and (in Firefox's case) // shared by multiple origins. // See T66721, and . - /Firefox/.test( navigator.userAgent ) || - - // Disabled by configuration. - !mw.config.get( 'wgResourceLoaderStorageEnabled' ) || - - // Disable module store in debug mode context - mw.config.get( 'debug' ) + /Firefox/.test( navigator.userAgent ) ) { // Clear any previous store to free up space. (T66721) this.clear(); -- 2.20.1