RCFilters: Allows specifying default highlights from the server

[lhc/web/wiklou.git] / resources / src / mediawiki.rcfilters / mw.rcfilters.UriProcessor.js

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
index a1ef981..c9436f4 100644 (file)
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
@@ -110,7 +110,6 @@
                this.filtersModel.toggleInvertedNamespaces( !!Number( parameters.invert ) );
 
                // Update highlight state
-               this.filtersModel.toggleHighlight( !!Number( parameters.highlight ) );
                this.filtersModel.getItems().forEach( function ( filterItem ) {
                        var color = parameters[ filterItem.getName() + '_color' ];
                        if ( color ) {
@@ -119,6 +118,7 @@
                                filterItem.clearHighlightColor();
                        }
                } );
+               this.filtersModel.toggleHighlight( !!Number( parameters.highlight ) );
 
                // Check all filter interactions
                this.filtersModel.reassessFilterInteractions();
@@ -300,7 +300,7 @@
         */
        mw.rcfilters.UriProcessor.prototype._buildEmptyParameterState = function () {
                var emptyParams = this.filtersModel.getParametersFromFilters( {} ),
-                       emptyHighlights = this.filtersModel.getHighlightParameters();
+                       emptyHighlights = this.filtersModel.getEmptyHighlightParameters();
 
                this.emptyParameterState = $.extend(
                        true,