From: Moriel Schottlender <moriel@gmail.com>
Date: Thu, 23 Mar 2017 18:03:56 +0000 (-0700)
Subject: RCFilters: Only show filter capsule as conflicted if it's selected
X-Git-Tag: 1.31.0-rc.0~3714^2
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=99d1ef70b29b5a95595a4c9cd64e51622bd17235;p=lhc%2Fweb%2Fwiklou.git

RCFilters: Only show filter capsule as conflicted if it's selected

Bug: T161172
Change-Id: Ib15ffd58290c616de216178cee6ae9b86178d871
---

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
index a72af8eb8d..728bb381dd 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
@@ -134,7 +134,7 @@
 			)
 			.toggleClass(
 				'mw-rcfilters-ui-capsuleItemWidget-conflicted',
-				this.model.isConflicted()
+				this.model.isSelected() && this.model.isConflicted()
 			);
 	};