Merge "RCFilters UI: Prevent label from stealing focus on click"

diff --combined resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 7de2a79,c09de18..8e26271
--- 1/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
--- 2/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@@ -206,6 -206,8 +206,8 @@@
         */
        mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.onMenuChoose = function ( item ) {
                this.controller.toggleFilterSelect( item.model.getName() );
+ 
+               this.focus();
        };
  
        /**
@@@ -236,8 -238,7 +238,8 @@@
         */
        mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.onTagSelect = function ( tagItem ) {
                var widget = this,
 -                      menuOption = this.menu.getItemFromData( tagItem.getData() );
 +                      menuOption = this.menu.getItemFromData( tagItem.getData() ),
 +                      oldInputValue = this.input.getValue();
  
                // Reset input
                this.input.setValue( '' );
@@@ -248,18 -249,14 +250,18 @@@
                this.menu.selectItem( menuOption );
  
                // Scroll to the item
 -              // We're binding a 'once' to the itemVisibilityChange event
 -              // so this happens when the menu is ready after the items
 -              // are visible again, in case this is done right after the
 -              // user filtered the results
 -              this.getMenu().once(
 -                      'itemVisibilityChange',
 -                      function () { widget.scrollToTop( menuOption.$element ); }
 -              );
 +              if ( oldInputValue ) {
 +                      // We're binding a 'once' to the itemVisibilityChange event
 +                      // so this happens when the menu is ready after the items
 +                      // are visible again, in case this is done right after the
 +                      // user filtered the results
 +                      this.getMenu().once(
 +                              'itemVisibilityChange',
 +                              function () { widget.scrollToTop( menuOption.$element ); }
 +                      );
 +              } else {
 +                      this.scrollToTop( menuOption.$element );
 +              }
        };
  
        /**