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

Merge "Drop StackLayout"

Browse source
This commit is contained in:
jenkins-bot 2022-07-07 13:17:08 +00:00 committed by Gerrit Code Review
parent ab8fba0f2a 483528affe
commit e6737b55af
4 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
extension.json
View file

@ -2132,6 +2132,7 @@
"modules/ve-mw/ui/dialogs/ve.ui.MWRequiredParamBlankConfirmDialog.js",
"modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js",
"modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js",
"modules/ve-mw/ui/layouts/ve.ui.MWVerticalLayout.js",
"modules/ve-mw/ui/layouts/ve.ui.MWTwoPaneTransclusionDialogLayout.js",
"modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js",
"modules/ve-mw/ui/contextitems/ve.ui.MWTransclusionContextItem.js",

5
modules/ve-mw/ui/layouts/ve.ui.MWTwoPaneTransclusionDialogLayout.js
View file

@ -27,10 +27,7 @@ ve.ui.MWTwoPaneTransclusionDialogLayout = function VeUiMWTwoPaneTransclusionDial
this.currentPageName = null;
this.pages = {};
this.ignoreFocus = false;
this.stackLayout = new OO.ui.StackLayout( {
continuous: true,
expanded: this.expanded
} );
this.stackLayout = new ve.ui.MWVerticalLayout();
this.setContentPanel( this.stackLayout );
this.sidebar = new ve.ui.MWTransclusionOutlineWidget();
this.outlineVisible = false;

16
modules/ve-mw/ui/layouts/ve.ui.MWVerticalLayout.js Normal file
View file

@ -0,0 +1,16 @@
/**
* Container for a vertical series of PageLayouts, similar to OO.ui.HorizontalLayout
*/
ve.ui.MWVerticalLayout = function VeUiMwVerticalLayout() {
// Parent constructor
ve.ui.MWVerticalLayout.super.call( this, { scrollable: true } );
// Mixin constructors
OO.ui.mixin.GroupElement.call( this, { $group: this.$element } );
// Initialization
this.$element.addClass( 've-ui-mwVerticalLayout' );
};
OO.inheritClass( ve.ui.MWVerticalLayout, OO.ui.PanelLayout );
OO.mixinClass( ve.ui.MWVerticalLayout, OO.ui.mixin.GroupElement );

13
modules/ve-mw/ui/styles/layouts/ve.ui.MWTwoPaneTransclusionDialogLayout.less
View file

@ -19,9 +19,16 @@
/* We don't want anything to collapse left/right, so shouldn't use margin */
padding: 0 54px;
&.oo-ui-stackLayout-continuous > .oo-ui-panelLayout-scrollable {
// Override from PanelLayout; only the StackLayout must be scrollable
overflow: hidden;
&.ve-ui-mwVerticalLayout {
> .oo-ui-panelLayout-scrollable {
// Override from PanelLayout; only the StackLayout must be scrollable
overflow: hidden;
}
> .oo-ui-panelLayout {
display: block;
position: relative;
}
}
> .oo-ui-panelLayout {