Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/89201
Change subject: Generalise the way extra modules are loaded
......................................................................
Generalise the way extra modules are loaded
Change-Id: Icd453421b022a6450d1358edbe2132e49ca0b3bf
---
M VisualEditor.hooks.php
M modules/ve-mw/init/ve.init.mw.Target.js
2 files changed, 15 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/01/89201/1
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index ab501fc..05d7fc8 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -288,7 +288,7 @@
'defaultUserOptions' => array(
'betatempdisable' =>
$wgDefaultUserOptions['visualeditor-betatempdisable'],
'enable' =>
$wgDefaultUserOptions['visualeditor-enable'],
- 'experimental' =>
$wgDefaultUserOptions['visualeditor-enable-experimental'],
+ 'enable-experimental' =>
$wgDefaultUserOptions['visualeditor-enable-experimental'],
),
'skins' => $wgVisualEditorSupportedSkins,
'tabPosition' => $wgVisualEditorTabPosition,
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index fc45845..976cf8e 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -20,7 +20,8 @@
* revision id here. Defaults to loading the latest version (see #load).
*/
ve.init.mw.Target = function VeInitMwTarget( $container, pageName, revisionId
) {
- var conf = mw.config.get( 'wgVisualEditorConfig' );
+ var i, len, prefName, prefValue, conf = mw.config.get(
'wgVisualEditorConfig' ),
+ extraModules = [ 'experimental' ];
// Parent constructor
ve.init.Target.call( this, $container );
@@ -34,11 +35,9 @@
this.apiUrl = mw.util.wikiScript( 'api' );
this.submitUrl = ( new mw.Uri( mw.util.wikiGetlink( this.pageName ) ) )
.extend( { 'action': 'submit' } );
+
this.modules = [
- ( mw.config.get( 'wgUserName' ) === null ?
- conf.defaultUserOptions.experimental :
- mw.user.options.get(
'visualeditor-enable-experimental', conf.defaultUserOptions.experimental ) ) ?
- 'ext.visualEditor.experimental' :
'ext.visualEditor.core',
+ 'ext.visualEditor.core',
'ext.visualEditor.data'
]
.concat(
@@ -47,6 +46,16 @@
['ext.visualEditor.viewPageTarget.icons-raster',
'ext.visualEditor.icons-raster']
)
.concat( mw.config.get( 'wgVisualEditorConfig' ).pluginModules
|| [] );
+ for ( i = 0, len = extraModules.length; i < len; i++ ) {
+ prefName = 'visualeditor-enable-' + extraModules[i];
+ prefValue = mw.config.get( 'wgUserName' ) === null ?
+ conf.defaultUserOptions[prefName] :
+ mw.user.options.get( prefName,
conf.defaultUserOptions[prefName] );
+ if ( prefValue && prefValue !== '0' ) {
+ this.modules.push( 'ext.visualEditor.' +
extraModules[i] );
+ }
+ }
+
this.pluginCallbacks = [];
this.modulesReady = $.Deferred();
this.loading = false;
--
To view, visit https://gerrit.wikimedia.org/r/89201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd453421b022a6450d1358edbe2132e49ca0b3bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
