jenkins-bot has submitted this change and it was merged.
Change subject: Move config vars that are global in nature to the startup module
......................................................................
Move config vars that are global in nature to the startup module
If they're in the per-page config, we'll have to deal with caching
nightmares when changing them.
Change-Id: Ic8866500b1f20aee36c436dcc3d132c8fde0a8fc
---
M VisualEditor.hooks.php
M VisualEditor.php
M modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
M modules/ve/init/mw/ve.init.mw.Target.js
4 files changed, 16 insertions(+), 5 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 9f4e2f8..42a38b7 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -59,10 +59,20 @@
* Adds extra variables to the page config.
*/
public static function onMakeGlobalVariablesScript( array &$vars,
OutputPage $out ) {
- global $wgVisualEditorEnableSectionEditLinks,
$wgVisualEditorParsoidProblemReportURL,
- $wgVisualEditorParsoidURL,
$wgVisualEditorEnableExperimentalCode;
$vars['wgVisualEditor'] = array(
'isPageWatched' => $out->getUser()->isWatched(
$out->getTitle() ),
+ );
+
+ return true;
+ }
+
+ /**
+ * Adds extra variables to the global config
+ */
+ public static function onResourceLoaderGetConfigVars( array &$vars ) {
+ global $wgVisualEditorEnableSectionEditLinks,
$wgVisualEditorParsoidProblemReportURL,
+ $wgVisualEditorParsoidURL,
$wgVisualEditorEnableExperimentalCode;
+ $vars['wgVisualEditorConfig'] = array(
'enableSectionEditLinks' =>
$wgVisualEditorEnableSectionEditLinks,
'reportProblemURL' =>
$wgVisualEditorParsoidProblemReportURL !== null ?
$wgVisualEditorParsoidProblemReportURL :
diff --git a/VisualEditor.php b/VisualEditor.php
index a3f5a96..d0e701c 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -513,6 +513,7 @@
$wgHooks['GetPreferences'][] = 'VisualEditorHooks::onGetPreferences';
$wgHooks['ListDefinedTags'][] = 'VisualEditorHooks::onListDefinedTags';
$wgHooks['MakeGlobalVariablesScript'][] =
'VisualEditorHooks::onMakeGlobalVariablesScript';
+$wgHooks['ResourceLoaderGetConfigVars'][] =
'VisualEditorHooks::onResourceLoaderGetConfigVars';
$wgHooks['ResourceLoaderTestModules'][] =
'VisualEditorHooks::onResourceLoaderTestModules';
$wgAutoloadClasses['VisualEditorMessagesModule'] = $dir .
'VisualEditorMessagesModule.php';
diff --git a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
index 0b283b3..3c27ae6 100644
--- a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
@@ -123,7 +123,7 @@
}
}
this.setupSkinTabs();
- if ( mw.config.get( 'wgVisualEditor' ).enableSectionEditLinks )
{
+ if ( mw.config.get( 'wgVisualEditorConfig'
).enableSectionEditLinks ) {
this.setupSectionEditLinks();
}
if ( this.isViewPage ) {
diff --git a/modules/ve/init/mw/ve.init.mw.Target.js
b/modules/ve/init/mw/ve.init.mw.Target.js
index f4e7f93..30fd921 100644
--- a/modules/ve/init/mw/ve.init.mw.Target.js
+++ b/modules/ve/init/mw/ve.init.mw.Target.js
@@ -31,7 +31,7 @@
this.submitUrl = ( new mw.Uri( mw.util.wikiGetlink( this.pageName ) ) )
.extend( { 'action': 'submit' } );
this.modules = [
- mw.config.get( 'wgVisualEditor'
).enableExperimentalCode ?
+ mw.config.get( 'wgVisualEditorConfig'
).enableExperimentalCode ?
'ext.visualEditor.experimental' :
'ext.visualEditor.core',
'ext.visualEditor.specialMessages'
]
@@ -602,7 +602,7 @@
'wiki': mw.config.get( 'wgDBname' )
};
$.post(
- mw.config.get( 'wgVisualEditor' ).reportProblemURL,
+ mw.config.get( 'wgVisualEditorConfig' ).reportProblemURL,
{ 'data': JSON.stringify( report ) },
function () {
// This space intentionally left blank
--
To view, visit https://gerrit.wikimedia.org/r/59646
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8866500b1f20aee36c436dcc3d132c8fde0a8fc
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
