Merge "RCFilters: Change the input icon on interaction"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 23 Jun 2017 18:35:45 +0000 (18:35 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Jun 2017 18:35:45 +0000 (18:35 +0000)
1  2 
resources/Resources.php
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js

Simple merge
                                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 ) );