From: Moriel Schottlender <moriel@gmail.com>
Date: Mon, 21 Aug 2017 21:03:29 +0000 (-0700)
Subject: RCFilters: Ignore sticky filters when emptying all filters
X-Git-Tag: 1.31.0-rc.0~2341^2
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=0a6240c4122dc8bd7f0543f817bf7939cb179f4b;p=lhc%2Fweb%2Fwiklou.git

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
---

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