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 b5b768f..669420c 100644 (file)
--- 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 );
 
        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 ) {
                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 c81b685..e17d028 100644 (file)
--- 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
                var filter = this.filterPopup.getSelectedFilter();
 
                // Toggle the filter

-               this.controller.toggleFilterSelect( filter );
+               if ( filter ) {
+                       this.controller.toggleFilterSelect( filter );
+               }

        };
 
        /**
        };
 
        /**