Merge "Convert article delete to use OOUI"

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

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 5b00dfe..4bee31e 100644 (file)
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -47,6 +47,8 @@
                                footers: [
                                        {
                                                name: 'viewSelect',
+                                               disabled: !mw.config.get( 'wgStructuredChangeFiltersEnableExperimentalViews' ),
+                                               sticky: false,
                                                // View select menu, appears on default view only
                                                $element: $( '<div>' )
                                                        .append( new mw.rcfilters.ui.ViewSwitchWidget( this.controller, this.model ).$element ),
@@ -147,12 +149,12 @@
                                        new OO.ui.ButtonOptionWidget( {
                                                data: 'namespaces',
                                                icon: 'article',
-                                               title: mw.msg( 'namespaces' )
+                                               title: mw.msg( 'rcfilters-view-namespaces-tooltip' )
                                        } ),
                                        new OO.ui.ButtonOptionWidget( {
                                                data: 'tags',
                                                icon: 'tag',
-                                               title: mw.msg( 'rcfilters-view-tags' )
+                                               title: mw.msg( 'rcfilters-view-tags-tooltip' )
                                        } )
                                ]
                        } );
@@ -455,6 +457,8 @@
                        menuOption = this.menu.getItemFromModel( tagItem.getModel() ),
                        oldInputValue = this.input.getValue();
 
+               this.menu.setUserSelecting( true );
+
                // Reset input
                this.input.setValue( '' );
 
@@ -475,11 +479,16 @@
                        // user filtered the results
                        this.getMenu().once(
                                'itemVisibilityChange',
-                               function () { widget.scrollToTop( menuOption.$element ); }
+                               function () {
+                                       widget.scrollToTop( menuOption.$element );
+                                       widget.menu.setUserSelecting( false );
+                               }
                        );
                } else {
                        this.scrollToTop( menuOption.$element );
+                       this.menu.setUserSelecting( false );
                }
+
        };
 
        /**