wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 19:26:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Toolbar: Make styling and insert menus collapsible"

Browse source
This commit is contained in:
jenkins-bot 2014-10-30 19:56:08 +00:00 committed by Gerrit Code Review
parent c402528d1a 6626450419
commit 9a1ed3ce3d
3 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ve-mw/init/ve.init.mw.Target.js
View file

@ -202,6 +202,7 @@ ve.init.mw.Target.static.toolbarGroups = [
indicator: 'down', indicator: 'down',
title: OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ), title: OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ),
include: [ { group: 'textStyle' }, 'language', 'clear' ], include: [ { group: 'textStyle' }, 'language', 'clear' ],
forceExpand: [ 'bold', 'italic', 'clear' ],
promote: [ 'bold', 'italic' ], promote: [ 'bold', 'italic' ],
demote: [ 'strikethrough', 'code', 'underline', 'language', 'clear' ] demote: [ 'strikethrough', 'code', 'underline', 'language', 'clear' ]
}, },
@ -228,6 +229,7 @@ ve.init.mw.Target.static.toolbarGroups = [
label: OO.ui.deferMsg( 'visualeditor-toolbar-insert' ), label: OO.ui.deferMsg( 'visualeditor-toolbar-insert' ),
indicator: 'down', indicator: 'down',
include: '*', include: '*',
forceExpand: [ 'media', 'transclusion', 'insertTable' ],
promote: [ 'media', 'transclusion' ], promote: [ 'media', 'transclusion' ],
demote: [ 'specialcharacter' ] demote: [ 'specialcharacter' ]
}, },

11
modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
View file

@ -96,6 +96,7 @@ ve.ui.MWMediaDialog.static.toolbarGroups = [
indicator: 'down', indicator: 'down',
title: OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ), title: OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ),
include: [ { group: 'textStyle' }, 'language', 'clear' ], include: [ { group: 'textStyle' }, 'language', 'clear' ],
forceExpand: [ 'bold', 'italic', 'clear' ],
promote: [ 'bold', 'italic' ], promote: [ 'bold', 'italic' ],
demote: [ 'strikethrough', 'code', 'underline', 'language', 'clear' ] demote: [ 'strikethrough', 'code', 'underline', 'language', 'clear' ]
}, },
@ -128,8 +129,18 @@ ve.ui.MWMediaDialog.static.toolbarGroups = [
'referencesList', 'referencesList',
'gallery' 'gallery'
], ],
forceExpand: [ 'media', 'transclusion', 'insertTable' ],
promote: [ 'media', 'transclusion' ], promote: [ 'media', 'transclusion' ],
demote: [ 'specialcharacter' ] demote: [ 'specialcharacter' ]
},
// Table
{
header: OO.ui.deferMsg( 'visualeditor-toolbar-table' ),
type: 'list',
icon: 'table-insert',
indicator: 'down',
include: [ { group: 'table' } ],
demote: [ 'deleteTable' ]
} }
]; ];

13
modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
View file

@ -87,12 +87,13 @@ ve.ui.MWReferenceDialog.static.toolbarGroups = [
indicator: 'down', indicator: 'down',
title: OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ), title: OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ),
include: [ { group: 'textStyle' }, 'language', 'clear' ], include: [ { group: 'textStyle' }, 'language', 'clear' ],
forceExpand: [ 'bold', 'italic', 'clear' ],
promote: [ 'bold', 'italic' ], promote: [ 'bold', 'italic' ],
demote: [ 'strikethrough', 'code', 'underline', 'language', 'clear' ] demote: [ 'strikethrough', 'code', 'underline', 'language', 'clear' ]
}, },
// Link // Link
{ include: [ 'link' ] }, { include: [ 'link' ] },
// Cite but not reference // Cite-transclusion but not reference
{ {
type: 'list', type: 'list',
label: OO.ui.deferMsg( 'visualeditor-toolbar-cite-label' ), label: OO.ui.deferMsg( 'visualeditor-toolbar-cite-label' ),
@ -120,8 +121,18 @@ ve.ui.MWReferenceDialog.static.toolbarGroups = [
'referencesList', 'referencesList',
'gallery' 'gallery'
], ],
forceExpand: [ 'media', 'transclusion', 'insertTable' ],
promote: [ 'media', 'transclusion' ], promote: [ 'media', 'transclusion' ],
demote: [ 'specialcharacter' ] demote: [ 'specialcharacter' ]
},
// Table
{
header: OO.ui.deferMsg( 'visualeditor-toolbar-table' ),
type: 'list',
icon: 'table-insert',
indicator: 'down',
include: [ { group: 'table' } ],
demote: [ 'deleteTable' ]
} }
]; ];