Sbisson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/351322 )
Change subject: RC Filters: don't bind onMenuToggle twice
......................................................................
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
---
M
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
1 file changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/22/351322/1
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 4192aad..c52ca1f 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 );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/351322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6855e6b07e1364ff76c2bccd82c33b21b82619b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
