Merge "RCFilters: Change the input icon on interaction"

diff --combined resources/Resources.php
index 5443a3a,c6a228b..66ea2a9
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -1415,14 -1415,12 +1415,14 @@@ return 
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css',
                'dependencies' => [
                        'mediawiki.action.edit.styles',
 +                      'jquery.accessKeyLabel',
                        'jquery.textSelection',
                        'jquery.byteLimit',
                        'mediawiki.api',
                ],
        ],
        'mediawiki.action.edit.styles' => [
 +              'targets' => [ 'desktop', 'mobile' ],
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.styles.css',
        ],
        'mediawiki.action.edit.collapsibleFooter' => [
@@@ -1757,8 -1755,6 +1757,8 @@@
                ],
                'dependencies' => [
                        'oojs',
 +                      'mediawiki.api',
 +                      'mediawiki.api.options',
                        'mediawiki.Uri',
                        'mediawiki.user',
                ],
@@@ -1774,7 -1770,6 +1774,7 @@@
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagItemWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js',
 +                      'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ViewSwitchWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js',
@@@ -1798,7 -1793,6 +1798,7 @@@
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.TagItemWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuHeaderWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.MenuSelectWidget.less',
 +                      'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ViewSwitchWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less',
@@@ -1816,7 -1810,6 +1816,7 @@@
                ],
                'messages' => [
                        'rcfilters-activefilters',
 +                      'rcfilters-advancedfilters',
                        'rcfilters-quickfilters',
                        'rcfilters-quickfilters-placeholder-title',
                        'rcfilters-quickfilters-placeholder-description',
@@@ -1866,6 -1859,7 +1866,7 @@@
                        'oojs-ui.styles.icons-editing-styling',
                        'oojs-ui.styles.icons-interactions',
                        'oojs-ui.styles.icons-content',
+                       'oojs-ui.styles.icons-layout',
                ],
        ],
        'mediawiki.special' => [
@@@ -1890,7 -1884,6 +1891,7 @@@
                        'oojs-ui.styles.icons-interactions',
                        'oojs-ui.styles.icons-moderation',
                        'mediawiki.widgets.datetime',
 +                      'jquery.makeCollapsible',
                ],
                'messages' => [
                        'apisandbox-intro',
@@@ -1925,7 -1918,6 +1926,7 @@@
                        'apisandbox-sending-request',
                        'apisandbox-loading-results',
                        'apisandbox-results-error',
 +                      'apisandbox-results-login-suppressed',
                        'apisandbox-request-selectformat-label',
                        'apisandbox-request-format-url-label',
                        'apisandbox-request-url-label',
@@@ -2068,7 -2060,6 +2069,7 @@@
        'mediawiki.special.search.commonsInterwikiWidget' => [
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js',
                'dependencies' => [
 +                      'mediawiki.api',
                        'mediawiki.Uri',
                        'mediawiki.jqueryMsg'
                ],
@@@ -2504,7 -2495,6 +2505,7 @@@
                        'resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js',
                ],
                'dependencies' => [
 +                      'mediawiki.api',
                        'oojs-ui-widgets',
                ],
                'targets' => [ 'desktop', 'mobile' ],
@@@ -2514,7 -2504,6 +2515,7 @@@
                        'resources/src/mediawiki.widgets/mw.widgets.UsersMultiselectWidget.js',
                ],
                'dependencies' => [
 +                      'mediawiki.api',
                        'oojs-ui-widgets',
                ],
                'targets' => [ 'desktop', 'mobile' ],
@@@ -2548,7 -2537,6 +2549,7 @@@
                        ],
                ],
                'dependencies' => [
 +                      'mediawiki.api',
                        'oojs-ui-core',
                ],
        ],

diff --combined resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 752bbe6,27b6ea1..5b00dfe
--- 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
@@@ -44,32 -44,19 +44,32 @@@
                                hideWhenOutOfView: false,
                                hideOnChoose: false,
                                width: 650,
 -                              $footer: $( '<div>' )
 -                                      .append(
 -                                              new OO.ui.ButtonWidget( {
 -                                                      framed: false,
 -                                                      icon: 'feedback',
 -                                                      flags: [ 'progressive' ],
 -                                                      label: mw.msg( 'rcfilters-filterlist-feedbacklink' ),
 -                                                      href: 'https://www.mediawiki.org/wiki/Help_talk:New_filters_for_edit_review'
 -                                              } ).$element
 -                                      )
 +                              footers: [
 +                                      {
 +                                              name: 'viewSelect',
 +                                              // View select menu, appears on default view only
 +                                              $element: $( '<div>' )
 +                                                      .append( new mw.rcfilters.ui.ViewSwitchWidget( this.controller, this.model ).$element ),
 +                                              views: [ 'default' ]
 +                                      },
 +                                      {
 +                                              name: 'feedback',
 +                                              // Feedback footer, appears on all views
 +                                              $element: $( '<div>' )
 +                                                      .append(
 +                                                              new OO.ui.ButtonWidget( {
 +                                                                      framed: false,
 +                                                                      icon: 'feedback',
 +                                                                      flags: [ 'progressive' ],
 +                                                                      label: mw.msg( 'rcfilters-filterlist-feedbacklink' ),
 +                                                                      href: 'https://www.mediawiki.org/wiki/Help_talk:New_filters_for_edit_review'
 +                                                              } ).$element
 +                                                      )
 +                                      }
 +                              ]
                        },
                        input: {
-                               icon: 'search',
+                               icon: 'menu',
                                placeholder: mw.msg( 'rcfilters-search-placeholder' )
                        }
                }, config ) );
@@@ -139,48 -126,6 +139,48 @@@
                        );
                }
  
 +              if ( mw.config.get( 'wgStructuredChangeFiltersEnableExperimentalViews' ) ) {
 +                      // Add a selector at the right of the input
 +                      this.viewsSelectWidget = new OO.ui.ButtonSelectWidget( {
 +                              classes: [ 'mw-rcfilters-ui-filterTagMultiselectWidget-views-select-widget' ],
 +                              items: [
 +                                      new OO.ui.ButtonOptionWidget( {
 +                                              data: 'namespaces',
 +                                              icon: 'article',
 +                                              title: mw.msg( 'namespaces' )
 +                                      } ),
 +                                      new OO.ui.ButtonOptionWidget( {
 +                                              data: 'tags',
 +                                              icon: 'tag',
 +                                              title: mw.msg( 'rcfilters-view-tags' )
 +                                      } )
 +                              ]
 +                      } );
 +
 +                      // Rearrange the UI so the select widget is at the right of the input
 +                      this.$element.append(
 +                              $( '<div>' )
 +                                      .addClass( 'mw-rcfilters-ui-table' )
 +                                      .append(
 +                                              $( '<div>' )
 +                                                      .addClass( 'mw-rcfilters-ui-row' )
 +                                                      .append(
 +                                                              $( '<div>' )
 +                                                                      .addClass( 'mw-rcfilters-ui-cell' )
 +                                                                      .addClass( 'mw-rcfilters-ui-filterTagMultiselectWidget-views-input' )
 +                                                                      .append( this.input.$element ),
 +                                                              $( '<div>' )
 +                                                                      .addClass( 'mw-rcfilters-ui-cell' )
 +                                                                      .addClass( 'mw-rcfilters-ui-filterTagMultiselectWidget-views-select' )
 +                                                                      .append( this.viewsSelectWidget.$element )
 +                                                      )
 +                                      )
 +                      );
 +
 +                      // Event
 +                      this.viewsSelectWidget.connect( this, { choose: 'onViewsSelectWidgetChoose' } );
 +              }
 +
                rcFiltersRow.append(
                        $( '<div>' )
                                .addClass( 'mw-rcfilters-ui-cell' )
@@@ -216,17 -161,6 +216,17 @@@
  
        /* Methods */
  
 +      /**
 +       * Respond to view select widget choose event
 +       *
 +       * @param {OO.ui.ButtonOptionWidget} buttonOptionWidget Chosen widget
 +       */
 +      mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.onViewsSelectWidgetChoose = function ( buttonOptionWidget ) {
 +              this.controller.switchView( buttonOptionWidget.getData() );
 +              this.viewsSelectWidget.selectItem( null );
 +              this.focus();
 +      };
 +
        /**
         * Respond to input change event
         *
@@@ -287,6 -221,8 +287,8 @@@
                                this.input.setValue( '' );
                        }
                }
+ 
+               this.input.setIcon( isVisible ? 'search' : 'menu' );
        };
  
        /**
@@@ -466,7 -402,7 +468,7 @@@
                this.selectTag( tagItem );
  
                // Scroll to the item
 -              if ( oldInputValue ) {
 +              if ( this.model.removeViewTriggers( 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