jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344660 )
Change subject: RCFilters UI: Only show full coverage message if item isn't
highlighted
......................................................................
RCFilters UI: Only show full coverage message if item isn't highlighted
Bug: T161273
Change-Id: If62bbab3e12fc3d9e83f9452723a9b2d6b75854a
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
index a066d9e..221d2a5 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
@@ -172,7 +172,9 @@
messageKey = details.message;
affectingItems = details.names;
- } else if ( this.isIncluded() ) {
+ } else if ( this.isIncluded() && !this.isHighlighted()
) {
+ // We only show the 'no effect' full-coverage
message
+ // if the item is also not highlighted. See
T161273
superset = this.getSuperset();
// For this message we need to collect the
affecting superset
affectingItems =
this.getGroupModel().getSelectedItems( this )
@@ -184,7 +186,7 @@
} );
messageKey = 'rcfilters-state-message-subset';
- } else if ( this.isFullyCovered() ) {
+ } else if ( this.isFullyCovered() &&
!this.isHighlighted() ) {
affectingItems =
this.getGroupModel().getSelectedItems( this )
.map( function ( item ) {
return mw.msg(
'quotation-marks', item.getLabel() );
--
To view, visit https://gerrit.wikimedia.org/r/344660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If62bbab3e12fc3d9e83f9452723a9b2d6b75854a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
