Merge "Add tags for undo edits"

[lhc/web/wiklou.git] / resources / src / mediawiki.rcfilters / ui / mw.rcfilters.ui.MenuSelectWidget.js

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
index 5ba42e7..98acab0 100644 (file)
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
@@ -135,6 +135,8 @@
        mw.rcfilters.ui.MenuSelectWidget.prototype.toggle = function ( show ) {
                this.lazyMenuCreation();
                mw.rcfilters.ui.MenuSelectWidget.parent.prototype.toggle.call( this, show );
+               // Always open this menu downwards. FilterTagMultiselectWidget scrolls it into view.
+               this.setVerticalPosition( 'below' );
        };
 
        /**
@@ -186,6 +188,8 @@
                                        currentItems.push(
                                                new mw.rcfilters.ui.FilterMenuOptionWidget(
                                                        widget.controller,
+                                                       widget.model,
+                                                       widget.model.getInvertModel(),
                                                        filterItem,
                                                        {
                                                                $overlay: widget.$overlay
@@ -330,7 +334,7 @@
         */
        mw.rcfilters.ui.MenuSelectWidget.prototype.onKeyDown = function ( e ) {
                var nextItem,
-                       currentItem = this.getHighlightedItem() || this.getSelectedItem();
+                       currentItem = this.findHighlightedItem() || this.getSelectedItem();
 
                // Call parent
                mw.rcfilters.ui.MenuSelectWidget.parent.prototype.onKeyDown.call( this, e );
@@ -343,12 +347,12 @@
                                case OO.ui.Keys.UP:
                                case OO.ui.Keys.LEFT:
                                        // Get the next item
-                                       nextItem = this.getRelativeSelectableItem( currentItem, -1 );
+                                       nextItem = this.findRelativeSelectableItem( currentItem, -1 );
                                        break;
                                case OO.ui.Keys.DOWN:
                                case OO.ui.Keys.RIGHT:
                                        // Get the next item
-                                       nextItem = this.getRelativeSelectableItem( currentItem, 1 );
+                                       nextItem = this.findRelativeSelectableItem( currentItem, 1 );
                                        break;
                        }