jenkins-bot has submitted this change and it was merged.
Change subject: Re-sync toolbarGroups for MWMediaEdit and MWReference dialogs
......................................................................
Re-sync toolbarGroups for MWMediaEdit and MWReference dialogs
Change-Id: Ic42a57e0e7a1639242092dbe41e13c1b8586f841
---
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
3 files changed, 13 insertions(+), 6 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 3aa9691..a9e4039 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -195,7 +195,7 @@
'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' ] },
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index 1d20a0d..09f6825 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -46,6 +46,7 @@
/* {
'type': 'menu',
'indicator': 'down',
+ 'title': OO.ui.deferMsg( 'visualeditor-toolbar-format-tooltip'
),
'include': [ { 'group': 'format' } ],
'promote': [ 'paragraph' ],
'demote': [ 'preformatted', 'heading1' ]
@@ -55,9 +56,10 @@
'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 @@
'indicator': 'down',
'include': '*',
'exclude': [
- { 'group': 'format' }, { 'group': 'structure' },
+ { 'group': 'format' },
+ { 'group': 'structure' },
'referenceList',
'gallery'
],
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 4c7a731..596cd74 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -46,6 +46,7 @@
/* {
'type': 'menu',
'indicator': 'down',
+ 'title': OO.ui.deferMsg( 'visualeditor-toolbar-format-tooltip'
),
'include': [ { 'group': 'format' } ],
'promote': [ 'paragraph' ],
'demote': [ 'preformatted', 'heading1' ]
@@ -55,9 +56,10 @@
'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 @@
'indicator': 'down',
'include': '*',
'exclude': [
- { 'group': 'format' }, { 'group': 'structure' },
- 'reference', 'referenceList',
+ { 'group': 'format' },
+ { 'group': 'structure' },
+ 'reference',
+ 'referenceList',
'gallery'
],
'promote': [ 'reference', 'mediaInsert' ],
--
To view, visit https://gerrit.wikimedia.org/r/118788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic42a57e0e7a1639242092dbe41e13c1b8586f841
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
