Merge "RCFilters: Actually check whether defaults are empty and update state"

diff --combined resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 0ef27eb,757a000..db75a27
--- 1/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
--- 2/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@@ -70,7 -70,7 +70,7 @@@
                                ]
                        },
                        input: {
 -                              icon: 'menu',
 +                              icon: 'add',
                                placeholder: mw.msg( 'rcfilters-search-placeholder' )
                        }
                }, config ) );
@@@ -99,7 -99,8 +99,8 @@@
                        } );
                        this.queriesModel.connect( this, {
                                itemUpdate: 'onSavedQueriesItemUpdate',
-                               initialize: 'onSavedQueriesInitialize'
+                               initialize: 'onSavedQueriesInitialize',
+                               'default': 'reevaluateResetRestoreState'
                        } );
                }
  
@@@ -313,7 -314,7 +314,7 @@@
                        this.controller.trackFilterGroupings( 'filtermenu' );
                }
  
 -              this.input.setIcon( isVisible ? 'search' : 'menu' );
 +              this.input.setIcon( isVisible ? 'search' : 'add' );
        };
  
        /**
@@@ -575,7 -576,7 +576,7 @@@
         * Reevaluate the restore state for the widget between setting to defaults and clearing all filters
         */
        mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.reevaluateResetRestoreState = function () {
-               var defaultsAreEmpty = this.model.areDefaultFiltersEmpty(),
+               var defaultsAreEmpty = this.controller.areDefaultsEmpty(),
                        currFiltersAreEmpty = this.model.areCurrentFiltersEmpty(),
                        hideResetButton = currFiltersAreEmpty && defaultsAreEmpty;