From 84ddcd5d23f91f5e07528a122eec58e32edfce13 Mon Sep 17 00:00:00 2001 From: Catrope Date: Mon, 2 Oct 2017 18:24:33 +0000 Subject: [PATCH] Revert "RCFilters: Don't apply/clear highlights 66 times" Breaks highlight display This reverts commit 212d67c67e153f95fd2eb49a75b7ece27d794b53. Change-Id: Ia0111bd35a40df56122a5b8c483de1be35609911 --- .../dm/mw.rcfilters.dm.FiltersViewModel.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 fdea5efbe2..3b882a6ba7 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js @@ -1026,14 +1026,12 @@ enable = enable === undefined ? !this.highlightEnabled : enable; if ( this.highlightEnabled !== enable ) { - // HACK make sure highlights are disabled globally while we toggle on the items, - // otherwise we'll call clearHighlight() and applyHighlight() many many times - this.highlightEnabled = false; + this.highlightEnabled = enable; + this.getItems().forEach( function ( filterItem ) { filterItem.toggleHighlight( this.highlightEnabled ); }.bind( this ) ); - this.highlightEnabled = enable; this.emit( 'highlightChange', this.highlightEnabled ); } }; -- 2.20.1