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

Merge "Fix template editor showing more than one new sidebar"

Browse source
This commit is contained in:
jenkins-bot 2021-07-16 10:18:06 +00:00 committed by Gerrit Code Review
parent 6e86365b81 8ab2ec25ea
commit 3858829c19
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
View file

@ -470,6 +470,11 @@ ve.ui.MWTemplateDialog.prototype.getSetupProcess = function ( data ) {
this.bookletLayout.autoFocus = false;
if ( this.isNewSidebar ) {
// FIXME: This is created at the wrong time. That's why we run into the situation
// where an old instance exists. Should be in initialize().
if ( this.pocSidebar ) {
this.pocSidebar.$element.remove();
}
this.pocSidebar = new ve.ui.MWTransclusionOutlineContainerWidget(
this.transclusionModel,
this.bookletLayout
@ -530,12 +535,17 @@ ve.ui.MWTemplateDialog.prototype.getSetupProcess = function ( data ) {
dialog.$body.append( dialog.bookletLayout.$element );
if ( dialog.pocSidebar ) {
// TODO: bookletLayout will be deprecated.
dialog.bookletLayout.outlinePanel.$element.prepend( $( '<div>' )
.addClass( 've-ui-mwTemplateDialog-pocSidebar-debug-container' )
.append(
dialog.pocSidebar.$element,
dialog.bookletLayout.outlineSelectWidget.$element
) );
var $debugContainer = dialog.bookletLayout.outlinePanel.$element
.children( '.ve-ui-mwTemplateDialog-pocSidebar-debug-container' );
if ( !$debugContainer.length ) {
$debugContainer = $( '<div>' )
.addClass( 've-ui-mwTemplateDialog-pocSidebar-debug-container' )
.prependTo( dialog.bookletLayout.outlinePanel.$element );
}
$debugContainer.append(
dialog.pocSidebar.$element,
dialog.bookletLayout.outlineSelectWidget.$element
);
}
dialog.bookletLayout.autoFocus = true;