jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/335989 )
Change subject: Remove explicit toolbar indicator definitions
......................................................................
Remove explicit toolbar indicator definitions
These are now computed upstream based on position of toolbar.
The menu tool now needs its indicator explicitly hidden.
Change-Id: Id2280f70553e1e45f3a42af45684c5808797925c
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
2 files changed, 1 insertion(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 47b415f..6836cd5 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -108,6 +108,7 @@
{
type: 'list',
icon: 'menu',
+ indicator: null,
title: ve.msg( 'visualeditor-pagemenu-tooltip' ),
include: [ 'meta', 'categories', 'settings',
'advancedSettings', 'languages', 'templatesUsed', 'findAndReplace' ]
},
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index ff05065..a3e9e18 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -52,7 +52,6 @@
{
classes: [ 've-test-toolbar-format' ],
type: 'menu',
- indicator: 'down',
title: OO.ui.deferMsg( 'visualeditor-toolbar-format-tooltip' ),
include: [ { group: 'format' } ],
promote: [ 'paragraph' ],
@@ -63,7 +62,6 @@
classes: [ 've-test-toolbar-style' ],
type: 'list',
icon: 'textStyle',
- indicator: 'down',
title: OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ),
include: [ { group: 'textStyle' }, 'language', 'clear' ],
forceExpand: [ 'bold', 'italic', 'clear' ],
@@ -77,7 +75,6 @@
classes: [ 've-test-toolbar-structure' ],
type: 'list',
icon: 'listBullet',
- indicator: 'down',
title: OO.ui.deferMsg( 'visualeditor-toolbar-structure' ),
include: [ { group: 'structure' } ],
demote: [ 'outdent', 'indent' ]
@@ -86,7 +83,6 @@
{
classes: [ 've-test-toolbar-insert' ],
label: OO.ui.deferMsg( 'visualeditor-toolbar-insert' ),
- indicator: 'down',
title: OO.ui.deferMsg( 'visualeditor-toolbar-insert' ),
include: '*',
forceExpand: [ 'media', 'transclusion', 'insertTable' ],
--
To view, visit https://gerrit.wikimedia.org/r/335989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2280f70553e1e45f3a42af45684c5808797925c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
