Merge "RCFilters: Add 'advanced filters' label to the view selection"

diff --combined resources/Resources.php
index 45a90d1,5c29e83..478f1ea
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -1423,6 -1423,7 +1423,6 @@@ return 
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css',
                'dependencies' => [
                        'mediawiki.action.edit.styles',
 -                      'jquery.accessKeyLabel',
                        'jquery.textSelection',
                        'jquery.byteLimit',
                        'mediawiki.widgets.visibleByteLimit',
@@@ -1877,6 -1878,7 +1877,7 @@@
                        'rcfilters-tag-prefix-tags',
                        'rcfilters-exclude-button-off',
                        'rcfilters-exclude-button-on',
+                       'rcfilters-view-advanced-filters-label',
                        'rcfilters-view-tags',
                        'rcfilters-view-namespaces-tooltip',
                        'rcfilters-view-tags-tooltip',

diff --combined resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 530429e,08beacd..3aa7161
--- 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
@@@ -29,7 -29,6 +29,7 @@@
                this.queriesModel = savedQueriesModel;
                this.$overlay = config.$overlay || this.$element;
                this.matchingQuery = null;
 +              this.currentView = this.model.getCurrentView();
  
                // Parent
                mw.rcfilters.ui.FilterTagMultiselectWidget.parent.call( this, $.extend( true, {
@@@ -140,6 -139,13 +140,13 @@@
                this.viewsSelectWidget = new OO.ui.ButtonSelectWidget( {
                        classes: [ 'mw-rcfilters-ui-filterTagMultiselectWidget-views-select-widget' ],
                        items: [
+                               new OO.ui.ButtonOptionWidget( {
+                                       framed: false,
+                                       data: '',
+                                       disabled: true,
+                                       classes: [ 'mw-rcfilters-ui-filterTagMultiselectWidget-views-select-widget-label' ],
+                                       label: mw.msg( 'rcfilters-view-advanced-filters-label' )
+                               } ),
                                new OO.ui.ButtonOptionWidget( {
                                        framed: false,
                                        data: 'namespaces',
@@@ -361,11 -367,6 +368,11 @@@
  
                // Update input
                this.input.setValue( inputValue );
 +
 +              if ( this.currentView !== view ) {
 +                      this.scrollToTop( this.$element );
 +                      this.currentView = view;
 +              }
        };
  
        /**