From: Moriel Schottlender <moriel@gmail.com>
Date: Thu, 16 Mar 2017 22:04:19 +0000 (-0700)
Subject: RCfilters UI: Change mute display for included filters
X-Git-Tag: 1.31.0-rc.0~3781
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=09c69c329ff5dc54d6524a9a52bae6ca7b316969;p=lhc%2Fweb%2Fwiklou.git

RCfilters UI: Change mute display for included filters

Bug: T156861
Bug: T149452
Change-Id: I64d84f0d84ff5e79da34f4897670102625c667cc
---

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemWidget.js
index 4ea284b232..7e6d776925 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemWidget.js
@@ -136,12 +136,13 @@
 		this.$element.toggleClass(
 			'mw-rcfilters-ui-filterItemWidget-muted',
 			this.model.isConflicted() ||
-			this.model.isIncluded() ||
 			(
 				// Item is also muted when any of the items in its group is active
 				this.model.getGroupModel().isActive() &&
 				// But it isn't selected
-				!this.model.isSelected()
+				!this.model.isSelected() &&
+				// And also not included
+				!this.model.isIncluded()
 			)
 		);