From: Moriel Schottlender Date: Thu, 20 Jul 2017 23:05:34 +0000 (-0700) Subject: RCFilters: Exclude 'hidden' filters from 'areCurrentFiltersEmpty' query X-Git-Tag: 1.31.0-rc.0~2648 X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=81140938bfbe511b18b74ef3580b793bbcc52acd;p=lhc%2Fweb%2Fwiklou.git RCFilters: Exclude 'hidden' filters from 'areCurrentFiltersEmpty' query Bug: T171129 Change-Id: I831692efbc5562d0f1d7433b9933118c7a9f6f14 --- 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 06fa0aa946..a30ebbfa7b 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js @@ -702,7 +702,7 @@ // Check if there are either any selected items or any items // that have highlight enabled return !this.getItems().some( function ( filterItem ) { - return filterItem.isSelected() || filterItem.isHighlighted(); + return !filterItem.getGroupModel().isHidden() && ( filterItem.isSelected() || filterItem.isHighlighted() ); } ); };