[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.1]: RCFilters: Actually read/write highlight parameter

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353701 )

Change subject: RCFilters: Actually read/write highlight parameter
......................................................................

RCFilters: Actually read/write highlight parameter

The highlight parameter enables/disables the highlight view. It was
not properly updated to the URL, and a separate typo made it not update
the model correctly.

Bug: T165107
Change-Id: Ie711d4d08fb3eeffca50c2953016e02e2620f898
(cherry picked from commit 9f35c355247070be4ba4dc22f5930be543ca873e)
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 10 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/353701/1

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 1dd0f83..f3fee74 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -178,7 +178,7 @@
                        highlightedItems[ item.getName() ] = highlightEnabled ?
                                item.getHighlightColor() : null;
                } );
-               highlightedItems.highlights = 
this.filtersModel.isHighlightEnabled();
+               highlightedItems.highlight = 
this.filtersModel.isHighlightEnabled();
 
                // Add item
                this.savedQueriesModel.addNewQuery(
@@ -250,11 +250,14 @@
                        data = queryItem.getData();
                        highlights = data.highlights;
 
+                       // Backwards compatibility; initial version mispelled 
'highlight' with 'highlights'
+                       highlights.highlight = highlights.highlights || 
highlights.highlight;
+
                        // Update model state from filters
                        this.filtersModel.toggleFiltersSelected( data.filters );
 
                        // Update highlight state
-                       this.filtersModel.toggleHighlight( 
!!highlights.highlights );
+                       this.filtersModel.toggleHighlight( 
!!highlights.highlight );
                        this.filtersModel.getItems().forEach( function ( 
filterItem ) {
                                var color = highlights[ filterItem.getName() ];
                                if ( color ) {
@@ -284,7 +287,7 @@
                this.filtersModel.getItemsSupportingHighlights().forEach( 
function ( item ) {
                        highlightedItems[ item.getName() ] = 
item.getHighlightColor();
                } );
-               highlightedItems.highlights = 
this.filtersModel.isHighlightEnabled();
+               highlightedItems.highlight = 
this.filtersModel.isHighlightEnabled();
 
                return this.savedQueriesModel.findMatchingQuery(
                        {
@@ -328,7 +331,7 @@
                this.filtersModel.getItemsSupportingHighlights().forEach( 
function ( item ) {
                        highlightedItems[ item.getName() ] = null;
                } );
-               highlightedItems.highlights = false;
+               highlightedItems.highlight = false;
 
                this.baseState = {
                        filters: this.filtersModel.getFiltersFromParameters( 
defaultParams ),
@@ -477,7 +480,7 @@
                );
 
                // Update highlight state
-               this.filtersModel.toggleHighlight( !!parameters.highlights );
+               this.filtersModel.toggleHighlight( !!parameters.highlight );
                this.filtersModel.getItems().forEach( function ( filterItem ) {
                        var color = parameters[ filterItem.getName() + '_color' 
];
                        if ( color ) {
@@ -512,7 +515,7 @@
                        savedParams = 
this.filtersModel.getParametersFromFilters( data.filters || {} );
 
                        // Translate highlights to parameters
-                       savedHighlights.highlights = queryHighlights.highlights;
+                       savedHighlights.highlight = queryHighlights.highlight;
                        $.each( queryHighlights, function ( filterName, color ) 
{
                                if ( filterName !== 'highlights' ) {
                                        savedHighlights[ filterName + '_color' 
] = color;
@@ -570,6 +573,7 @@
                uri.extend( this.filtersModel.getParametersFromFilters() );
 
                // highlight params
+               uri.query.highlight = Number( 
this.filtersModel.isHighlightEnabled() );
                Object.keys( highlightParams ).forEach( function ( paramName ) {
                        if ( highlightParams[ paramName ] ) {
                                uri.query[ paramName ] = highlightParams[ 
paramName ];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie711d4d08fb3eeffca50c2953016e02e2620f898
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: Mooeypoo <mor...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits