From b62c4bbe04f8a1e339837158babf1d0a1cc624c9 Mon Sep 17 00:00:00 2001 From: Moriel Schottlender Date: Fri, 7 Apr 2017 11:15:17 -0700 Subject: [PATCH] RCFilters UI: Check that filter exists before changing its state Bug: T162417 Change-Id: I53bdd8106f5072f70f2618f2b6e6c9da37675fc9 --- resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js | 5 +++++ .../ui/mw.rcfilters.ui.FilterWrapperWidget.js | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 ); + } }; /** -- 2.20.1