Merge "FilterTagMultiselectWidget: Use frameless buttons and fix height issues"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 12 Jul 2017 18:45:34 +0000 (18:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 12 Jul 2017 18:45:34 +0000 (18:45 +0000)
1  2 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js

@@@ -47,8 -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 ),
@@@ -71,7 -69,7 +71,7 @@@
                                ]
                        },
                        input: {
 -                              icon: 'search',
 +                              icon: 'menu',
                                placeholder: mw.msg( 'rcfilters-search-placeholder' )
                        }
                }, config ) );
                                classes: [ 'mw-rcfilters-ui-filterTagMultiselectWidget-views-select-widget' ],
                                items: [
                                        new OO.ui.ButtonOptionWidget( {
+                                               framed: false,
                                                data: 'namespaces',
                                                icon: 'article',
 -                                              title: mw.msg( 'namespaces' )
 +                                              title: mw.msg( 'rcfilters-view-namespaces-tooltip' )
                                        } ),
                                        new OO.ui.ButtonOptionWidget( {
+                                               framed: false,
                                                data: 'tags',
                                                icon: 'tag',
 -                                              title: mw.msg( 'rcfilters-view-tags' )
 +                                              title: mw.msg( 'rcfilters-view-tags-tooltip' )
                                        } )
                                ]
                        } );
                                this.input.setValue( '' );
                        }
                }
 +
 +              this.input.setIcon( isVisible ? 'search' : 'menu' );
        };
  
        /**
                        menuOption = this.menu.getItemFromModel( tagItem.getModel() ),
                        oldInputValue = this.input.getValue();
  
 +              this.menu.setUserSelecting( true );
 +
                // Reset input
                this.input.setValue( '' );
  
                        // 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 );
                }
 +
        };
  
        /**