Fomafix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346045 )
Change subject: SiteModule.php: Use ResourceLoader::makeConfigSetScript
......................................................................
SiteModule.php: Use ResourceLoader::makeConfigSetScript
Change-Id: Iac5147450664e5accf1413102f694352566fee20
---
M client/includes/Modules/SiteModule.php
M client/tests/phpunit/includes/Modules/SiteModuleTest.php
2 files changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/45/346045/1
diff --git a/client/includes/Modules/SiteModule.php
b/client/includes/Modules/SiteModule.php
index e2183ab..2818909 100644
--- a/client/includes/Modules/SiteModule.php
+++ b/client/includes/Modules/SiteModule.php
@@ -43,11 +43,7 @@
);
}
- return Xml::encodeJsCall(
- 'mw.config.set',
- [ 'wbCurrentSite', $currentSite ],
- ResourceLoader::inDebugMode()
- );
+ return ResourceLoader::makeConfigSetScript( [ 'wbCurrentSite'
=> $currentSite ] );
}
}
diff --git a/client/tests/phpunit/includes/Modules/SiteModuleTest.php
b/client/tests/phpunit/includes/Modules/SiteModuleTest.php
index 1353eea..69e2b56 100644
--- a/client/tests/phpunit/includes/Modules/SiteModuleTest.php
+++ b/client/tests/phpunit/includes/Modules/SiteModuleTest.php
@@ -29,7 +29,7 @@
public function testGetScript() {
$module = new SiteModule();
$script = $module->getScript( $this->getContext() );
- $this->assertStringStartsWith(
'mw.config.set("wbCurrentSite",', $script );
+ $this->assertStringStartsWith(
'mw.config.set({"wbCurrentSite":', $script );
$this->assertStringEndsWith( ');', $script );
}
--
To view, visit https://gerrit.wikimedia.org/r/346045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac5147450664e5accf1413102f694352566fee20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Fomafix <foma...@googlemail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
