wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 14:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Merge "templateParameterClick" and "choose" events"

Browse source
This commit is contained in:
jenkins-bot 2021-09-15 10:11:12 +00:00 committed by Gerrit Code Review
parent 5c688148e8 338a800837
commit fe6c46bbdc
3 changed files with 4 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ve-mw/tests/ui/widgets/ve.ui.MWTransclusionOutlineParameterSelectWidget.test.js
View file

@ -20,7 +20,7 @@ QUnit.test( 'interaction with items', ( assert ) => {
assert.ok( item.isSelected(), 'clicking the checkbox selects the item' );
let eventsFired = 0;
widget.connect( this, { templateParameterClick: () => eventsFired++ } );
widget.connect( this, { choose: () => eventsFired++ } );
widget.onMouseDown( {
which: OO.ui.MouseButtons.LEFT,

16
modules/ve-mw/ui/widgets/ve.ui.MWTransclusionOutlineParameterSelectWidget.js
View file

@ -43,15 +43,6 @@ OO.mixinClass( ve.ui.MWTransclusionOutlineParameterSelectWidget, OO.ui.mixin.Tab
* @param {boolean} selected
*/
/**
* This is fired instead of the "choose" event from the {@see OO.ui.SelectWidget} base class when
* pressing enter/click on a parameter that's already selected.
*
* @event templateParameterClick
* @param {ve.ui.MWTransclusionOutlineParameterWidget} item
* @param {boolean} selected
*/
/* Static Methods */
/**
@ -136,14 +127,14 @@ ve.ui.MWTransclusionOutlineParameterSelectWidget.prototype.onFocus = function ()
/**
* @inheritDoc OO.ui.SelectWidget
* @param {jQuery.Event} e
* @fires templateParameterClick
* @fires choose
*/
ve.ui.MWTransclusionOutlineParameterSelectWidget.prototype.onMouseDown = function ( e ) {
if ( e.which === OO.ui.MouseButtons.LEFT ) {
var item = this.findTargetItem( e );
// Same as pressing enter, see below.
if ( item && item.isSelected() ) {
this.emit( 'templateParameterClick', item, item.isSelected() );
this.emit( 'choose', item, item.isSelected() );
// Don't call the parent, i.e. can't click to unselect the item
return false;
@ -158,7 +149,6 @@ ve.ui.MWTransclusionOutlineParameterSelectWidget.prototype.onMouseDown = functio
* @param {KeyboardEvent} e
* @fires choose
* @fires templateParameterSelectionChanged
* @fires templateParameterClick
*/
ve.ui.MWTransclusionOutlineParameterSelectWidget.prototype.onDocumentKeyDown = function ( e ) {
var item;
@ -192,7 +182,7 @@ ve.ui.MWTransclusionOutlineParameterSelectWidget.prototype.onDocumentKeyDown = f
item = this.findHighlightedItem();
// Same as clicking with the mouse, see above.
if ( item && item.isSelected() ) {
this.emit( 'templateParameterClick', item, item.isSelected() );
this.emit( 'choose', item, item.isSelected() );
e.preventDefault();
// Don't call the parent, i.e. can't use enter to unselect the item

21
modules/ve-mw/ui/widgets/ve.ui.MWTransclusionOutlineTemplateWidget.js
View file

@ -53,8 +53,6 @@ ve.ui.MWTransclusionOutlineTemplateWidget = function VeUiMWTransclusionOutlineTe
.connect( this, {
choose: 'onTemplateParameterChoose',
templateParameterSelectionChanged: 'onTemplateParameterSelectionChanged',
// Note that choose implies focus, but not the other way around
templateParameterClick: 'onTemplateParameterClick',
change: 'onParameterWidgetListChanged'
} );
@ -218,25 +216,6 @@ ve.ui.MWTransclusionOutlineTemplateWidget.prototype.onTemplateParameterSelection
}
};
/**
* @private
* @param {OO.ui.OptionWidget} item
* @param {boolean} selected
* @fires focusTemplateParameterById
*/
ve.ui.MWTransclusionOutlineTemplateWidget.prototype.onTemplateParameterClick = function ( item, selected ) {
// Fail-safe. There should be no code-path that calls this with false.
if ( !selected ) {
return;
}
var paramName = item.getData(),
param = this.templateModel.getParameter( paramName );
if ( param ) {
this.emit( 'focusTemplateParameterById', param.getId() );
}
};
/**
* @private
* @param {OO.ui.Element[]} items