Mailing List Archive

Bartosz Dziewo?ski has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405993 )

Change subject: Support 'safemode' parameter
......................................................................

Support 'safemode' parameter

This moves 'preloadModules' from global VE config (wgVisualEditorConfig)
to per-page VE config (wgVisualEditor).

Bug: T185303
Depends-On: Ia1c1f7eef5af22925100ebe0a37a9a6ba0808fe5
Change-Id: I7e9b61a5012a027c76aa6bdb22096d7391957913
---
M VisualEditor.hooks.php
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
2 files changed, 3 insertions(+), 2 deletions(-)


git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/93/405993/1

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index cfd8ce6..d1b4aa0 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -785,6 +785,7 @@
* @return bool Always true
*/
public static function onMakeGlobalVariablesScript( array &$vars, OutputPage $out ) {
+ $veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 'visualeditor' );
$pageLanguage = $out->getTitle()->getPageLanguage();
$fallbacks = $pageLanguage->getConverter()->getVariantFallbacks(
$pageLanguage->getPreferredVariant()
@@ -796,6 +797,7 @@
'pageVariantFallbacks' => $fallbacks,
'usePageImages' => defined( 'PAGE_IMAGES_INSTALLED' ),
'usePageDescriptions' => defined( 'WBC_VERSION' ),
+ 'preloadModules' => $out->filterModules( $veConfig->get( 'VisualEditorPreloadModules' ) ),
];

return true;
@@ -822,7 +824,6 @@

$vars['wgVisualEditorConfig'] = [
'disableForAnons' => $veConfig->get( 'VisualEditorDisableForAnons' ),
- 'preloadModules' => $veConfig->get( 'VisualEditorPreloadModules' ),
'preferenceModules' => $veConfig->get( 'VisualEditorPreferenceModules' ),
'namespaces' => $availableNamespaces,
'contentModels' => $availableContentModels,
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 48ea296..6847638 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -207,7 +207,7 @@
mw.libs.ve.targetLoader.addPlugin( function () {
// Run VisualEditorPreloadModules, but if they fail, we still want to continue
// loading, so convert failure to success
- return mw.loader.using( conf.preloadModules ).catch(
+ return mw.loader.using( mw.config.get( 'wgVisualEditor' ).preloadModules ).catch(
function () {
return $.Deferred().resolve();
}

--
To view, visit https://gerrit.wikimedia.org/r/405993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e9b61a5012a027c76aa6bdb22096d7391957913
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewo?ski <matma.rex@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits