wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 10:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix forgotten "setPage" property because of merge conflict

Browse source 
The rename in I5a16ab4 was done the exact same time a new usage was
introduced via Ibb717ca. Neither patch shows a conflict. Still there
is one.

I remove the extra `|| null` line because it is just not needed. We
don't need to set the property to null when it was already null.

Bug: T312213
Change-Id: Id3f025786c9412e8c1946434113c41356da08098
This commit is contained in:
Thiemo Kreuz 2022-08-01 09:39:47 +02:00
parent 799c0b86ea
commit cdb9766752
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -145,14 +145,14 @@ ve.ui.MWTransclusionOutlineParameterSelectWidget.prototype.highlightItem = funct
*/
ve.ui.MWTransclusionOutlineParameterSelectWidget.prototype.markParameterAsUnused = function ( paramName ) {
// There is no OO.ui.SelectWidget.unselectItemByData(), we need to do this manually
/** @type {ve.ui.MWTransclusionOutlineParameterWidget} */
var item = paramName ? this.findItemFromData( paramName ) : null;
if ( item ) {
item.setSelected( false );
paramName = paramName || null;
// An unused parameter can't be the active (set) one; it doesn't exist in the content pane
if ( this.itemSet === paramName ) {
this.itemSet = null;
item.setParameter( false );
if ( this.activeParameter === paramName ) {
this.activeParameter = null;
item.toggleActivePageIndicator( false );
}
}
};