From: Stephane Bisson <sbisson@wikimedia.org>
Date: Tue, 2 May 2017 14:46:54 +0000 (-0400)
Subject: RC Filters: don't bind onMenuToggle twice
X-Git-Tag: 1.31.0-rc.0~3376^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=6e20339087555a995158c5feb0c11b9dbb712c61

RC Filters: don't bind onMenuToggle twice

Having 2 event handlers for onMenuToggle means
double-counting popup openings, which breaks
the highlight guided tour prompt schedule.

Bug: T164228
Change-Id: Ia6855e6b07e1364ff76c2bccd82c33b21b82619b
---

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 4192aadaa0..c52ca1fc22 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -2,7 +2,7 @@
 	/**
 	 * List displaying all filter groups
 	 *
-	 * @extends OO.ui.Widget
+	 * @extends OO.ui.MenuTagMultiselectWidget
 	 * @mixins OO.ui.mixin.PendingElement
 	 *
 	 * @constructor
@@ -76,7 +76,6 @@
 			itemUpdate: 'onModelItemUpdate',
 			highlightChange: 'onModelHighlightChange'
 		} );
-		this.menu.connect( this, { toggle: 'onMenuToggle' } );
 
 		// Build the content
 		$contentWrapper.append(
@@ -125,8 +124,11 @@
 	 * @param {boolean} isVisible Menu is visible
 	 */
 	mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.onMenuToggle = function ( isVisible ) {
+		// Parent
+		mw.rcfilters.ui.FilterTagMultiselectWidget.parent.prototype.onMenuToggle.call( this );
+
 		if ( isVisible ) {
-			mw.hook( 'RcFilters.popup.open' ).fire( this.getMenu().getSelectedItem() );
+			mw.hook( 'RcFilters.popup.open' ).fire();
 
 			if ( !this.getMenu().getSelectedItem() ) {
 				// If there are no selected items, scroll menu to top
@@ -136,7 +138,6 @@
 			}
 		} else {
 			// Clear selection
-			this.getMenu().selectItem( null );
 			this.selectTag( null );
 		}
 	};