diff options
5 files changed, 30 insertions, 13 deletions
diff --git a/includes/EditPage.php b/includes/EditPage.php index d05b99638824..c73792066ff7 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -3747,7 +3747,11 @@ HTML $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 09d90d6e702a..123945365dd7 100644 --- a/includes/resourceloader/ResourceLoaderLanguageDataModule.php +++ b/includes/resourceloader/ResourceLoaderLanguageDataModule.php @@ -52,10 +52,14 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule { * @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 fe0c84543643..55b1f4b14dcb 100644 --- a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php +++ b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php @@ -49,11 +49,15 @@ class ResourceLoaderLanguageNamesModule extends ResourceLoaderModule { * @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 c79554a618e2..3818305dc177 100644 --- a/includes/resourceloader/ResourceLoaderStartUpModule.php +++ b/includes/resourceloader/ResourceLoaderStartUpModule.php @@ -356,7 +356,8 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { ); $mwConfigSetJsCall = Xml::encodeJsCall( 'mw.config.set', - array( $configuration ) + array( $configuration ), + ResourceLoader::inDebugMode() ); $out .= "var startUp = function () {\n" . @@ -370,7 +371,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { $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 d78fa9da7d83..5f4bc16b5e70 100644 --- a/includes/resourceloader/ResourceLoaderUserDefaultsModule.php +++ b/includes/resourceloader/ResourceLoaderUserDefaultsModule.php @@ -53,6 +53,10 @@ class ResourceLoaderUserDefaultsModule extends ResourceLoaderModule { * @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() + ); } } |