wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 18:39:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use add template when adding a new transclusion part"

Browse source
This commit is contained in:
jenkins-bot 2021-05-14 10:14:48 +00:00 committed by Gerrit Code Review
parent c35c2bb022 42b557ff80
commit c3dd0115f8
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
View file

@ -344,12 +344,7 @@ ve.ui.MWTransclusionDialog.prototype.initialize = function () {
this.addTemplateButton = new OO.ui.ButtonWidget( {
framed: false,
icon: 'puzzle',
title: ve.msg(
// Temporary switch for verbose template search.
mw.config.get( 'wgVisualEditorConfig' ).templateSearchImprovements ?
'visualeditor-dialog-transclusion-template-search' :
'visualeditor-dialog-transclusion-add-template'
)
title: ve.msg( 'visualeditor-dialog-transclusion-add-template' )
} );
this.addContentButton = new OO.ui.ButtonWidget( {
framed: false,

24
modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
View file

@ -82,8 +82,15 @@ ve.ui.MWTemplatePlaceholderPage = function VeUiMWTemplatePlaceholderPage( placeh
};
// Temporary switch for verbose template search.
if ( mw.config.get( 'wgVisualEditorConfig' ).templateSearchImprovements ) {
var dialogTitle = this.placeholder.getTransclusion().parts.length === 1 ?
'visualeditor-dialog-transclusion-template-search' :
'visualeditor-dialog-transclusion-add-template';
addTemplateFieldsetConfig = ve.extendObject( addTemplateFieldsetConfig, {
label: ve.msg( 'visualeditor-dialog-transclusion-template-search' ),
// The following messages are used here:
// * visualeditor-dialog-transclusion-template-search
// * visualeditor-dialog-transclusion-add-template
label: ve.msg( dialogTitle ),
help: ve.msg( 'visualeditor-dialog-transclusion-template-search-help' ),
helpInline: true
} );
@ -109,18 +116,21 @@ ve.ui.MWTemplatePlaceholderPage.prototype.setOutlineItem = function () {
// Parent method
ve.ui.MWTemplatePlaceholderPage.super.prototype.setOutlineItem.apply( this, arguments );
var dialogTitle = ( this.placeholder.getTransclusion().parts.length === 1 &&
mw.config.get( 'wgVisualEditorConfig' ).templateSearchImprovements ) ?
'visualeditor-dialog-transclusion-template-search' :
'visualeditor-dialog-transclusion-add-template';
if ( this.outlineItem ) {
this.outlineItem
.setIcon( 'puzzle' )
.setMovable( true )
.setRemovable( true )
.setFlags( [ 'placeholder' ] )
.setLabel( ve.msg(
// Temporary switch for verbose template search.
mw.config.get( 'wgVisualEditorConfig' ).templateSearchImprovements ?
'visualeditor-dialog-transclusion-template-search' :
'visualeditor-dialog-transclusion-placeholder'
) );
// The following messages are used here:
// * visualeditor-dialog-transclusion-template-search
// * visualeditor-dialog-transclusion-add-template
.setLabel( ve.msg( dialogTitle ) );
}
};