From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 23 Jun 2017 18:35:45 +0000 (+0000)
Subject: Merge "RCFilters: Change the input icon on interaction"
X-Git-Tag: 1.31.0-rc.0~2911
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=f1c48a9d2143eb7c0132cda68665be8d53d31592;p=lhc%2Fweb%2Fwiklou.git

Merge "RCFilters: Change the input icon on interaction"
---

f1c48a9d2143eb7c0132cda68665be8d53d31592
diff --cc resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 752bbe618e,27b6ea106f..5b00dfe831
--- a/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 ) );