wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-11-28 02:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Load VisualEditor plugin modules with ReplyWidgetVisual"

Browse source
This commit is contained in:
jenkins-bot 2020-06-24 21:09:36 +00:00 committed by Gerrit Code Review
parent e55ac1ef79 e7a9185ab1
commit b51799ec2e
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/CommentController.js
View file

@ -10,13 +10,17 @@ var
config = require( './config.json' ),
enableVisual = config.enableVisual || ( new mw.Uri() ).query.dtvisual,
defaultEditMode = mw.user.options.get( 'discussiontools-editmode' ) || mw.config.get( 'wgDiscussionToolsFallbackEditMode' ),
defaultVisual = enableVisual && defaultEditMode === 'visual';
defaultVisual = enableVisual && defaultEditMode === 'visual',
conf = mw.config.get( 'wgVisualEditorConfig' ),
visualModules = [ 'ext.discussionTools.ReplyWidgetVisual' ]
.concat( conf.pluginModules.filter( mw.loader.getState ) ),
plainModules = [ 'ext.discussionTools.ReplyWidgetPlain' ];
// Start loading reply widget code
if ( defaultVisual ) {
mw.loader.using( 'ext.discussionTools.ReplyWidgetVisual' );
mw.loader.using( visualModules );
} else {
mw.loader.using( 'ext.discussionTools.ReplyWidgetPlain' );
mw.loader.using( plainModules );
}
function CommentController( $pageContainer, comment, thread ) {
@ -208,15 +212,12 @@ CommentController.prototype.setup = function ( mode ) {
};
CommentController.prototype.getReplyWidgetClass = function ( visual ) {
var moduleName;
if ( visual === undefined ) {
visual = defaultVisual;
}
moduleName = visual ? 'ext.discussionTools.ReplyWidgetVisual' : 'ext.discussionTools.ReplyWidgetPlain';
return mw.loader.using( moduleName ).then( function () {
return require( moduleName );
return mw.loader.using( visual ? visualModules : plainModules ).then( function () {
return require( visual ? 'ext.discussionTools.ReplyWidgetVisual' : 'ext.discussionTools.ReplyWidgetPlain' );
} );
};