From cdb9766752fa22bc79a610eb6b69900b2be827e7 Mon Sep 17 00:00:00 2001 From: Thiemo Kreuz Date: Mon, 1 Aug 2022 09:39:47 +0200 Subject: [PATCH] Fix forgotten "setPage" property because of merge conflict 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 --- .../ve.ui.MWTransclusionOutlineParameterSelectWidget.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWTransclusionOutlineParameterSelectWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWTransclusionOutlineParameterSelectWidget.js index 4ee28190a2..4d397a22c8 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWTransclusionOutlineParameterSelectWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWTransclusionOutlineParameterSelectWidget.js @@ -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 ); } } };