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

Revert "Revert "Targets: Use align:'after' instead of actionGroups""

Browse source 
This reverts commit e2b5e2a1bb.
It should be safe to re-attempt this now.

Bug: T339317
Change-Id: Ia4ebb11ca162a4e6d985076ea2d2dd914d04fc1d
This commit is contained in:
Bartosz Dziewoński 2023-06-29 18:14:07 +00:00
parent d857750e12
commit bbda4fc160
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/ve-mw-collab/ve.init.mw.CollabTarget.js
View file

@ -66,17 +66,15 @@ ve.init.mw.CollabTarget.static.toolbarGroups.splice( 4, 0, {
ve.init.mw.CollabTarget.static.toolbarGroups = ve.init.mw.CollabTarget.static.toolbarGroups.filter( function ( group ) {
return group.name !== 'reference';
} );
ve.init.mw.CollabTarget.static.importRules = ve.copy( ve.init.mw.CollabTarget.static.importRules );
ve.init.mw.CollabTarget.static.importRules.external.blacklist[ 'link/mwExternal' ] = false;
ve.init.mw.CollabTarget.static.actionGroups = [
ve.init.mw.CollabTarget.static.toolbarGroups.push(
{
name: 'help',
align: 'after',
include: [ 'help' ]
},
{
name: 'pageMenu',
align: 'after',
type: 'list',
icon: 'menu',
indicator: null,
@ -87,13 +85,18 @@ ve.init.mw.CollabTarget.static.actionGroups = [
},
{
name: 'authorList',
align: 'after',
include: [ 'authorList' ]
},
{
name: 'export',
align: 'after',
include: [ 'export' ]
}
];
);
ve.init.mw.CollabTarget.static.importRules = ve.copy( ve.init.mw.CollabTarget.static.importRules );
ve.init.mw.CollabTarget.static.importRules.external.blacklist[ 'link/mwExternal' ] = false;
/* Methods */

2
modules/ve-mw-collab/ve.init.mw.MobileCollabTarget.js
View file

@ -89,8 +89,6 @@ ve.init.mw.MobileCollabTarget.static.toolbarGroups = [
}
];
ve.init.mw.MobileCollabTarget.static.actionGroups = [];
/* Methods */
/**

9
modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
View file

@ -88,13 +88,16 @@ OO.inheritClass( ve.init.mw.DesktopArticleTarget, ve.init.mw.ArticleTarget );
/* Static Properties */
ve.init.mw.DesktopArticleTarget.static.actionGroups = [
ve.init.mw.DesktopArticleTarget.static.toolbarGroups = ve.copy( ve.init.mw.DesktopArticleTarget.static.toolbarGroups );
ve.init.mw.DesktopArticleTarget.static.toolbarGroups.push(
{
name: 'help',
align: 'after',
include: [ 'help', 'notices' ]
},
{
name: 'pageMenu',
align: 'after',
type: 'list',
icon: 'menu',
indicator: null,
@ -106,6 +109,7 @@ ve.init.mw.DesktopArticleTarget.static.actionGroups = [
},
{
name: 'editMode',
align: 'after',
type: 'list',
icon: 'edit',
title: ve.msg( 'visualeditor-mweditmode-tooltip' ),
@ -115,10 +119,11 @@ ve.init.mw.DesktopArticleTarget.static.actionGroups = [
},
{
name: 'save',
align: 'after',
type: 'bar',
include: [ { group: 'save' } ]
}
];
);
/**
* Compatibility map used with jQuery.client to decide if a browser should