Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/181089
Change subject: Use more pretty output in ResourceLoader debug mode for arrays ...................................................................... Use more pretty output in ResourceLoader debug mode for arrays Effected: - mw.language.data - mw.language.names - mw.config.set - mw.user.options.set for defaults - mw.toolbar Change-Id: I8a9e718ab15f0b3f80e12b817295c6843a570d46 --- M includes/EditPage.php M includes/resourceloader/ResourceLoaderLanguageDataModule.php M includes/resourceloader/ResourceLoaderLanguageNamesModule.php M includes/resourceloader/ResourceLoaderStartUpModule.php M includes/resourceloader/ResourceLoaderUserDefaultsModule.php 5 files changed, 30 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/89/181089/1 diff --git a/includes/EditPage.php b/includes/EditPage.php index d05b996..c737920 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -3747,7 +3747,11 @@ $tool['id'], ); - $script .= Xml::encodeJsCall( 'mw.toolbar.addButton', $params ); + $script .= Xml::encodeJsCall( + 'mw.toolbar.addButton', + $params, + ResourceLoader::inDebugMode() + ); } $script .= '});'; diff --git a/includes/resourceloader/ResourceLoaderLanguageDataModule.php b/includes/resourceloader/ResourceLoaderLanguageDataModule.php index 09d90d6..1239453 100644 --- a/includes/resourceloader/ResourceLoaderLanguageDataModule.php +++ b/includes/resourceloader/ResourceLoaderLanguageDataModule.php @@ -52,10 +52,14 @@ * @return string JavaScript code */ public function getScript( ResourceLoaderContext $context ) { - return Xml::encodeJsCall( 'mw.language.setData', array( - $context->getLanguage(), - $this->getData( $context ) - ) ); + return Xml::encodeJsCall( + 'mw.language.setData', + array( + $context->getLanguage(), + $this->getData( $context ) + ), + ResourceLoader::inDebugMode() + ); } /** diff --git a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php index fe0c845..55b1f4b 100644 --- a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php +++ b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php @@ -49,11 +49,15 @@ * @return string JavaScript code */ public function getScript( ResourceLoaderContext $context ) { - return Xml::encodeJsCall( 'mw.language.setData', array( - $context->getLanguage(), - 'languageNames', - $this->getData( $context ) - ) ); + return Xml::encodeJsCall( + 'mw.language.setData', + array( + $context->getLanguage(), + 'languageNames', + $this->getData( $context ) + ), + ResourceLoader::inDebugMode() + ); } public function getDependencies() { diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php index c79554a..3818305 100644 --- a/includes/resourceloader/ResourceLoaderStartUpModule.php +++ b/includes/resourceloader/ResourceLoaderStartUpModule.php @@ -356,7 +356,8 @@ ); $mwConfigSetJsCall = Xml::encodeJsCall( 'mw.config.set', - array( $configuration ) + array( $configuration ), + ResourceLoader::inDebugMode() ); $out .= "var startUp = function () {\n" . @@ -370,7 +371,7 @@ $scriptTag = Html::linkedScript( self::getStartupModulesUrl( $context ) ); $out .= "if ( isCompatible() ) {\n" . "\t" . Xml::encodeJsCall( 'document.write', array( $scriptTag ) ) . - "}"; + "\n}"; } return $out; diff --git a/includes/resourceloader/ResourceLoaderUserDefaultsModule.php b/includes/resourceloader/ResourceLoaderUserDefaultsModule.php index d78fa9d..5f4bc16 100644 --- a/includes/resourceloader/ResourceLoaderUserDefaultsModule.php +++ b/includes/resourceloader/ResourceLoaderUserDefaultsModule.php @@ -53,6 +53,10 @@ * @return string */ public function getScript( ResourceLoaderContext $context ) { - return Xml::encodeJsCall( 'mw.user.options.set', array( User::getDefaultOptions() ) ); + return Xml::encodeJsCall( + 'mw.user.options.set', + array( User::getDefaultOptions() ), + ResourceLoader::inDebugMode() + ); } } -- To view, visit https://gerrit.wikimedia.org/r/181089 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a9e718ab15f0b3f80e12b817295c6843a570d46 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender <umherirrender_de...@web.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits