Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/343789 )

Change subject: RCFilters UI: Don't set reset button title in "restore" mode
......................................................................

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
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/89/343789/1

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 944ebaa..54445d9 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 ? '' : mw.msg( 
'rcfilters-clear-all-filters' )
+               );
 
                this.resetButton.toggle( !hideResetButton );
                this.emptyFilterMessage.toggle( currFiltersAreEmpty );

-- 
To view, visit https://gerrit.wikimedia.org/r/343789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idab5731f51b42455801a505475002adf8437c66e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope <r...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to