Merge "RCFilters: Don't reload when removing highlighted item"

diff --combined resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 4bc6183,f74dc3b..5b12cf7
--- 1/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
--- 2/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@@ -386,7 -386,7 +386,7 @@@
                this._deleteExcludedValuesFromFilterState( defaultFilters );
  
                if ( Object.keys( defaultParams ).some( function ( paramName ) {
 -                      return paramName.endsWith( '_color' ) && defaultParams[ paramName ] !== null;
 +                      return paramName.match( /_color$/ ) && defaultParams[ paramName ] !== null;
                } ) ) {
                        // There are highlights in the defaults, they're definitely
                        // not empty
@@@ -452,12 -452,20 +452,20 @@@
         */
        mw.rcfilters.Controller.prototype.clearFilter = function ( filterName ) {
                var filterItem = this.filtersModel.getItemByName( filterName ),
-                       isHighlighted = filterItem.isHighlighted();
+                       isHighlighted = filterItem.isHighlighted(),
+                       isSelected = filterItem.isSelected();
  
-               if ( filterItem.isSelected() || isHighlighted ) {
+               if ( isSelected || isHighlighted ) {
                        this.filtersModel.clearHighlightColor( filterName );
                        this.filtersModel.toggleFilterSelected( filterName, false );
-                       this.updateChangesList();
+ 
+                       if ( isSelected ) {
+                               // Only update the changes list if the filter changed
+                               // its selection state. If it only changed its highlight
+                               // then don't reload
+                               this.updateChangesList();
+                       }
+ 
                        this.filtersModel.reassessFilterInteractions( filterItem );
  
                        // Log filter grouping