From: Moriel Schottlender <moriel@gmail.com>
Date: Thu, 23 Feb 2017 18:06:58 +0000 (-0800)
Subject: RCFilters UI: Reassess interaction after resetting filters
X-Git-Tag: 1.31.0-rc.0~3993^2
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=c03589c7a387ba3d8f597cf85e44f77f21dd8fc3;p=lhc%2Fweb%2Fwiklou.git

RCFilters UI: Reassess interaction after resetting filters

Both resetting to defaults or resetting to no-filters state should
retrigger the interaction assessment so all filters should get their
included, fullyCovered and conflicted states resetted.

Bug: T158135
Change-Id: Iae23129b7fb378adb712b34e8e64208bbb70ccd7
---

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 3ba4dc0703..1df31a279a 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -59,6 +59,9 @@
 	 */
 	mw.rcfilters.Controller.prototype.resetToDefaults = function () {
 		this.filtersModel.setFiltersToDefaults();
+		// Check all filter interactions
+		this.filtersModel.reassessFilterInteractions();
+
 		this.updateURL();
 		this.updateChangesList();
 	};
@@ -69,6 +72,9 @@
 	mw.rcfilters.Controller.prototype.emptyFilters = function () {
 		this.filtersModel.emptyAllFilters();
 		this.filtersModel.clearAllHighlightColors();
+		// Check all filter interactions
+		this.filtersModel.reassessFilterInteractions();
+
 		this.updateURL();
 		this.updateChangesList();
 	};