From: Moriel Schottlender <moriel@gmail.com>
Date: Fri, 7 Apr 2017 18:15:17 +0000 (-0700)
Subject: RCFilters UI: Check that filter exists before changing its state
X-Git-Tag: 1.31.0-rc.0~3568
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=b62c4bbe04f8a1e339837158babf1d0a1cc624c9;p=lhc%2Fweb%2Fwiklou.git

RCFilters UI: Check that filter exists before changing its state

Bug: T162417
Change-Id: I53bdd8106f5072f70f2618f2b6e6c9da37675fc9
---

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index b5b768f222..669420caf9 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -111,6 +111,11 @@
 	mw.rcfilters.Controller.prototype.toggleFilterSelect = function ( filterName, isSelected ) {
 		var filterItem = this.filtersModel.getItemByName( filterName );
 
+		if ( !filterItem ) {
+			// If no filter was found, break
+			return;
+		}
+
 		isSelected = isSelected === undefined ? !filterItem.isSelected() : isSelected;
 
 		if ( filterItem.isSelected() !== isSelected ) {
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
index c81b685abb..e17d028ab7 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@ -158,7 +158,9 @@
 		var filter = this.filterPopup.getSelectedFilter();
 
 		// Toggle the filter
-		this.controller.toggleFilterSelect( filter );
+		if ( filter ) {
+			this.controller.toggleFilterSelect( filter );
+		}
 	};
 
 	/**