Merge "Re-sync toolbarGroups for MWMediaEdit and MWReference dialogs"

This commit is contained in:
jenkins-bot 2014-03-17 17:23:37 +00:00 committed by Gerrit Code Review
commit 99ece6e6d0
3 changed files with 13 additions and 6 deletions

View file

@ -195,7 +195,7 @@ ve.init.mw.Target.static.toolbarGroups = [
'title': OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ),
'include': [ { 'group': 'textStyle' }, 'clear' ],
'promote': [ 'bold', 'italic' ],
'demote': [ 'strikethrough', 'code', 'underline', 'clear' ]
'demote': [ 'strikethrough', 'code', 'underline', 'clear' ]
},
// Link
{ 'include': [ 'link' ] },

View file

@ -46,6 +46,7 @@ ve.ui.MWMediaEditDialog.static.toolbarGroups = [
/* {
'type': 'menu',
'indicator': 'down',
'title': OO.ui.deferMsg( 'visualeditor-toolbar-format-tooltip' ),
'include': [ { 'group': 'format' } ],
'promote': [ 'paragraph' ],
'demote': [ 'preformatted', 'heading1' ]
@ -55,9 +56,10 @@ ve.ui.MWMediaEditDialog.static.toolbarGroups = [
'type': 'list',
'icon': 'text-style',
'indicator': 'down',
'title': OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ),
'include': [ { 'group': 'textStyle' }, 'clear' ],
'promote': [ 'bold', 'italic' ],
'demote': [ 'strikethrough', 'code', 'underline', 'clear' ]
'demote': [ 'strikethrough', 'code', 'underline', 'clear' ]
},
// Link
{ 'include': [ 'link' ] },
@ -72,7 +74,8 @@ ve.ui.MWMediaEditDialog.static.toolbarGroups = [
'indicator': 'down',
'include': '*',
'exclude': [
{ 'group': 'format' }, { 'group': 'structure' },
{ 'group': 'format' },
{ 'group': 'structure' },
'referenceList',
'gallery'
],

View file

@ -46,6 +46,7 @@ ve.ui.MWReferenceDialog.static.toolbarGroups = [
/* {
'type': 'menu',
'indicator': 'down',
'title': OO.ui.deferMsg( 'visualeditor-toolbar-format-tooltip' ),
'include': [ { 'group': 'format' } ],
'promote': [ 'paragraph' ],
'demote': [ 'preformatted', 'heading1' ]
@ -55,9 +56,10 @@ ve.ui.MWReferenceDialog.static.toolbarGroups = [
'type': 'list',
'icon': 'text-style',
'indicator': 'down',
'title': OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ),
'include': [ { 'group': 'textStyle' }, 'clear' ],
'promote': [ 'bold', 'italic' ],
'demote': [ 'strikethrough', 'code', 'underline', 'clear' ]
'demote': [ 'strikethrough', 'code', 'underline', 'clear' ]
},
// Link
{ 'include': [ 'link' ] },
@ -72,8 +74,10 @@ ve.ui.MWReferenceDialog.static.toolbarGroups = [
'indicator': 'down',
'include': '*',
'exclude': [
{ 'group': 'format' }, { 'group': 'structure' },
'reference', 'referenceList',
{ 'group': 'format' },
{ 'group': 'structure' },
'reference',
'referenceList',
'gallery'
],
'promote': [ 'reference', 'mediaInsert' ],