jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/381819 )

Change subject: Revert "RCFilters: Don't apply/clear highlights 66 times"
......................................................................


Revert "RCFilters: Don't apply/clear highlights 66 times"

Breaks highlight display

This reverts commit 212d67c67e153f95fd2eb49a75b7ece27d794b53.

Change-Id: Ia0111bd35a40df56122a5b8c483de1be35609911
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
1 file changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Catrope: 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 fdea5ef..3b882a6 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 );
                }
        };

-- 
To view, visit https://gerrit.wikimedia.org/r/381819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0111bd35a40df56122a5b8c483de1be35609911
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Mooeypoo <[email protected]>
Gerrit-Reviewer: Zoranzoki21 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to