From 38b6fc0d798e21aa51c504d4bfeba3a129a90d16 Mon Sep 17 00:00:00 2001 From: Moriel Schottlender Date: Fri, 24 Mar 2017 10:17:37 -0700 Subject: [PATCH] RCFilters UI: Only show full coverage message if item isn't highlighted Bug: T161273 Change-Id: If62bbab3e12fc3d9e83f9452723a9b2d6b75854a --- .../mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 a066d9e917..221d2a54c6 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() ); -- 2.20.1