From 07157675bdaaaa1ae982b658d98dce41fb24b6e9 Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Mon, 20 Mar 2017 16:26:14 -0700 Subject: [PATCH] RCFilters UI: Don't set reset button title in "restore" mode In "clear" mode, the button only has an icon, so it needs a title. In "restore" mode, the button has text, so it doesn't need a title, much less a wrong one (the one from the "clear" mode). Bonus: Remove properties from constructor that are already set in reevaluateResetRestoreState(). Change-Id: Idab5731f51b42455801a505475002adf8437c66e --- .../ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js index 944ebaa120..e481bdeb3c 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js @@ -37,9 +37,7 @@ this.selected = null; this.resetButton = new OO.ui.ButtonWidget( { - icon: 'trash', framed: false, - title: mw.msg( 'rcfilters-clear-all-filters' ), classes: [ 'mw-rcfilters-ui-filterCapsuleMultiselectWidget-resetButton' ] } ); @@ -183,6 +181,9 @@ this.resetButton.setLabel( currFiltersAreEmpty ? mw.msg( 'rcfilters-restore-default-filters' ) : '' ); + this.resetButton.setTitle( + currFiltersAreEmpty ? null : mw.msg( 'rcfilters-clear-all-filters' ) + ); this.resetButton.toggle( !hideResetButton ); this.emptyFilterMessage.toggle( currFiltersAreEmpty ); -- 2.20.1