jenkins-bot has submitted this change and it was merged.
Change subject: Use upstreamed actionGroups functionality
......................................................................
Use upstreamed actionGroups functionality
Depends on I272175dff3 in ve core.
Change-Id: I94cef0f3d8c1b903780890934c2c4963cbe05989
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 12 insertions(+), 15 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
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 598c737..8878d47 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -96,6 +96,17 @@
/* Static Properties */
+ve.init.mw.DesktopArticleTarget.static.actionGroups = [
+ { include: [ 'help', 'notices' ] },
+ {
+ type: 'list',
+ icon: 'menu',
+ title: ve.msg( 'visualeditor-pagemenu-tooltip' ),
+ include: [ 'meta', 'settings', 'advancedSettings',
'categories', 'languages', 'findAndReplace' ]
+ },
+ { include: [ 'editModeSource' ] }
+];
+
/**
* Compatibility map used with jQuery.client to black-list incompatible
browsers.
*
@@ -891,21 +902,7 @@
* @inheritdoc
*/
ve.init.mw.DesktopArticleTarget.prototype.attachToolbarSaveButton = function
() {
- this.actionsToolbar = new ve.ui.TargetToolbar( this );
-
- this.actionsToolbar.setup( [
- { include: [ 'help', 'notices' ] },
- {
- type: 'list',
- icon: 'menu',
- title: ve.msg( 'visualeditor-pagemenu-tooltip' ),
- include: [ 'meta', 'settings', 'advancedSettings',
'categories', 'languages', 'findAndReplace' ]
- },
- { include: [ 'editModeSource' ] }
- ], this.getSurface() );
-
- this.toolbar.$actions.append( this.actionsToolbar.$element,
this.toolbarSaveButton.$element );
- this.actionsToolbar.initialize();
+ this.toolbar.$actions.append( this.toolbarSaveButton.$element );
// Make the toolbar recalculate its sizes for narrow/wide switching.
// This really should not be necessary.
this.toolbar.narrowThreshold = this.toolbar.$group.width() +
this.toolbar.$actions.width();
--
To view, visit https://gerrit.wikimedia.org/r/258471
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94cef0f3d8c1b903780890934c2c4963cbe05989
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
