Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/209760
Change subject: Follow-up 6a12b782: Remove VisualEditor's cite drop-down too ...................................................................... Follow-up 6a12b782: Remove VisualEditor's cite drop-down too Change-Id: Icce345f08cbee51404f9737787eddef39cacce94 --- M modules/ve.ui.CiteFromIdInspectorTool.js 1 file changed, 3 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid refs/changes/60/209760/1 diff --git a/modules/ve.ui.CiteFromIdInspectorTool.js b/modules/ve.ui.CiteFromIdInspectorTool.js index 9d20f1a..f15cc34 100644 --- a/modules/ve.ui.CiteFromIdInspectorTool.js +++ b/modules/ve.ui.CiteFromIdInspectorTool.js @@ -8,7 +8,7 @@ // HACK: Find the position of the current citation toolbar definition // and manipulate it. - var i, len, originalDefinition, + var i, len, toolGroups = ve.init.mw.Target.static.toolbarGroups, citeIndex = toolGroups.length; @@ -20,41 +20,12 @@ for ( i = 0, len = toolGroups.length; i < len; i++ ) { if ( ve.getProp( toolGroups[i], 'include', 0, 'group' ) === 'cite' ) { citeIndex = i; - originalDefinition = ve.copy( toolGroups[i] ); - // Remove the label, since we only need a downward-arrow indicator - delete originalDefinition.label; break; } } - // HACK: Replace the previous cite group to represent citoid and the - // dropdown menu for cite tools. - ve.init.mw.Target.static.toolbarGroups[ citeIndex ] = { - header: OO.ui.deferMsg( 'visualeditor-toolbar-cite-group' ), - title: OO.ui.deferMsg( 'visualeditor-toolbar-cite-group-tooltip' ), - include: [ 'citefromid', 'moreCiteTool' ] - }; - - /** - * MediaWiki UserInterface citation tool group - * - * @class - * @extends OO.ui.ToolGroupTool - * @constructor - * @param {OO.ui.ToolGroup} toolGroup - * @param {Object} [config] Configuration options - */ - ve.ui.MoreCiteTool = function VeUiMoreCiteTool( toolGroup, config ) { - OO.ui.ToolGroupTool.call( this, toolGroup, config ); - }; - OO.inheritClass( ve.ui.MoreCiteTool, OO.ui.ToolGroupTool ); - ve.ui.MoreCiteTool.static.autoAddToCatchall = false; - ve.ui.MoreCiteTool.static.name = 'moreCiteTool'; - ve.ui.MoreCiteTool.static.group = 'citeTools'; - ve.ui.MoreCiteTool.static.title = - OO.ui.deferMsg( 'visualeditor-toolbar-cite-tooltip' ); - ve.ui.MoreCiteTool.static.groupConfig = originalDefinition; - ve.ui.toolFactory.register( ve.ui.MoreCiteTool ); + // HACK: Replace the previous cite group with the citoid tool. + ve.init.mw.Target.static.toolbarGroups[ citeIndex ] = { include: [ 'citefromid' ] }; /** * MediaWiki UserInterface cite from ID inspector tool. -- To view, visit https://gerrit.wikimedia.org/r/209760 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icce345f08cbee51404f9737787eddef39cacce94 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Citoid Gerrit-Branch: master Gerrit-Owner: Jforrester <jforres...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits