From fdd862b6f04b1847379261fe448db662a91a00a0 Mon Sep 17 00:00:00 2001 From: Stephane Bisson Date: Wed, 8 Nov 2017 19:46:45 -0500 Subject: [PATCH] RCFilters: some more highlight cleanup Change-Id: I81eb3bf86f786c79a94e99d51602d904504f918f --- .../dm/mw.rcfilters.dm.FiltersViewModel.js | 9 --------- .../mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js | 1 - .../dm/mw.rcfilters.dm.SavedQueriesModel.js | 3 +-- 3 files changed, 1 insertion(+), 12 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 3a6efe2b1d..d959540390 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js @@ -1338,15 +1338,6 @@ this.getItemByName( filterName ).clearHighlightColor(); }; - /** - * Clear highlight for all filter items - */ - mw.rcfilters.dm.FiltersViewModel.prototype.clearAllHighlightColors = function () { - this.getItems().forEach( function ( filterItem ) { - filterItem.clearHighlightColor(); - } ); - }; - /** * Return a version of the given string that is without any * view triggers. diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js index 7b54833f77..44b6c8cff5 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js @@ -41,7 +41,6 @@ // Highlight this.cssClass = config.cssClass; this.highlightColor = config.defaultHighlightColor; - this.highlightEnabled = !!config.defaultHighlightColor; }; /* Initialization */ diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js index 23f600739f..1d7934f1a1 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js @@ -349,8 +349,7 @@ // Return parameter representation return this.filtersModel.getMinimizedParamRepresentation( $.extend( true, {}, this.filtersModel.getParametersFromFilters( savedFilters ), - data.highlights, - { highlight: data.params.highlight } + data.highlights ) ); }; -- 2.20.1