mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
synced 2024-11-15 02:23:58 +00:00
Merge "Revert "Targets: Use align:'after' instead of actionGroups""
This commit is contained in:
commit
d5e4ead3c7
|
@ -66,15 +66,17 @@ 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.toolbarGroups.push(
|
||||
|
||||
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 = [
|
||||
{
|
||||
name: 'help',
|
||||
align: 'after',
|
||||
include: [ 'help' ]
|
||||
},
|
||||
{
|
||||
name: 'pageMenu',
|
||||
align: 'after',
|
||||
type: 'list',
|
||||
icon: 'menu',
|
||||
indicator: null,
|
||||
|
@ -85,18 +87,13 @@ ve.init.mw.CollabTarget.static.toolbarGroups.push(
|
|||
},
|
||||
{
|
||||
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 */
|
||||
|
||||
|
|
|
@ -89,6 +89,8 @@ ve.init.mw.MobileCollabTarget.static.toolbarGroups = [
|
|||
}
|
||||
];
|
||||
|
||||
ve.init.mw.MobileCollabTarget.static.actionGroups = [];
|
||||
|
||||
/* Methods */
|
||||
|
||||
/**
|
||||
|
|
|
@ -88,16 +88,13 @@ OO.inheritClass( ve.init.mw.DesktopArticleTarget, ve.init.mw.ArticleTarget );
|
|||
|
||||
/* Static Properties */
|
||||
|
||||
ve.init.mw.DesktopArticleTarget.static.toolbarGroups = ve.copy( ve.init.mw.DesktopArticleTarget.static.toolbarGroups );
|
||||
ve.init.mw.DesktopArticleTarget.static.toolbarGroups.push(
|
||||
ve.init.mw.DesktopArticleTarget.static.actionGroups = [
|
||||
{
|
||||
name: 'help',
|
||||
align: 'after',
|
||||
include: [ 'help', 'notices' ]
|
||||
},
|
||||
{
|
||||
name: 'pageMenu',
|
||||
align: 'after',
|
||||
type: 'list',
|
||||
icon: 'menu',
|
||||
indicator: null,
|
||||
|
@ -108,7 +105,6 @@ ve.init.mw.DesktopArticleTarget.static.toolbarGroups.push(
|
|||
},
|
||||
{
|
||||
name: 'editMode',
|
||||
align: 'after',
|
||||
type: 'list',
|
||||
icon: 'edit',
|
||||
title: ve.msg( 'visualeditor-mweditmode-tooltip' ),
|
||||
|
@ -118,11 +114,10 @@ ve.init.mw.DesktopArticleTarget.static.toolbarGroups.push(
|
|||
},
|
||||
{
|
||||
name: 'save',
|
||||
align: 'after',
|
||||
type: 'bar',
|
||||
include: [ 'showSave' ]
|
||||
}
|
||||
);
|
||||
];
|
||||
|
||||
/**
|
||||
* Compatibility map used with jQuery.client to decide if a browser should
|
||||
|
|
Loading…
Reference in a new issue