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 22c176f..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' );
        };
 
        /**
@@ -332,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 );