jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372891 )
Change subject: RCFilters: Ignore sticky filters when emptying all filters
......................................................................
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
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitPopupWidget.js
2 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
Sbisson: Looks good to me, approved
jenkins-bot: Verified
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 cf226da..a8ee06b 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 a8c6c28..7248bd7 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
--
To view, visit https://gerrit.wikimedia.org/r/372891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4db5689d1d2ef627bbb5ec34f8af772157d1ff09
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Sbisson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
