From 0a6240c4122dc8bd7f0543f817bf7939cb179f4b Mon Sep 17 00:00:00 2001 From: Moriel Schottlender Date: Mon, 21 Aug 2017 14:03:29 -0700 Subject: [PATCH] RCFilters: Ignore sticky filters when emptying all filters Also, as a bonus, actually connect the 'update' event to the already existing method that was supposed to respond to an update event on the 'enhanced' filter. Bug: T172580 Change-Id: I4db5689d1d2ef627bbb5ec34f8af772157d1ff09 --- .../dm/mw.rcfilters.dm.FiltersViewModel.js | 4 +++- .../ui/mw.rcfilters.ui.ChangesLimitPopupWidget.js | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js index cf226da1ae..a8ee06bf49 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js @@ -793,7 +793,9 @@ */ mw.rcfilters.dm.FiltersViewModel.prototype.emptyAllFilters = function () { this.getItems().forEach( function ( filterItem ) { - this.toggleFilterSelected( filterItem.getName(), false ); + if ( !filterItem.getGroupModel().isSticky() ) { + this.toggleFilterSelected( filterItem.getName(), false ); + } }.bind( this ) ); }; diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitPopupWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitPopupWidget.js index a8c6c28f1c..7248bd7760 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitPopupWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitPopupWidget.js @@ -32,6 +32,7 @@ // Events this.valuePicker.connect( this, { choose: [ 'emit', 'limit' ] } ); this.groupByPageCheckbox.connect( this, { change: [ 'emit', 'groupByPage' ] } ); + this.groupByPageItemModel.connect( this, { update: 'onGroupByPageModelUpdate' } ); // Initialize this.$element -- 2.20.1