Merge "Revert "RCFilters: Remove excluded params from URL""

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
index c25aa73..621c200 100644 (file)
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
@@ -85,9 +85,6 @@
                        )
                );
 
-               // Remove excluded params from the url
-               uri.query = this.filtersModel.removeExcludedParams( uri.query );
-
                // Reapply unrecognized params and url version
                uri.query = $.extend( true, {}, uri.query, unrecognizedParams, { urlversion: '2' } );
 

diff --git a/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js b/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js
index 2bc9c21..534af86 100644 (file)
--- a/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js
+++ b/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js
@@ -25,15 +25,6 @@
                                { name: 'filter5', cssClass: 'filter5class' },
                                { name: 'filter6' } // Not supporting highlights
                        ]
-               }, {
-                       name: 'group4',
-                       title: 'Group 4',
-                       type: 'boolean',
-                       isSticky: true,
-                       filters: [
-                               { name: 'stickyFilter7', cssClass: 'filter7class' },
-                               { name: 'stickyFilter8', cssClass: 'filter8class' }
-                       ]
                } ],
                minimalDefaultParams = {
                        filter1: '1',
@@ -94,17 +85,6 @@
                        { urlversion: '2', filter2: '1', group3: 'filter5', foo: 'bar' },
                        'Model state is reflected in the updated URI with existing uri params'
                );
-
-               // Update the model with sticky filter
-               filtersModel.toggleFiltersSelected( {
-                       group4__stickyFilter7: true
-               } );
-
-               assert.deepEqual(
-                       ( uriProcessor.getUpdatedUri( {} ) ).query,
-                       { urlversion: '2', filter2: '1', group3: 'filter5' },
-                       'Sticky parameters are not reflected in the URI query'
-               );
        } );
 
        QUnit.test( 'updateModelBasedOnQuery', function ( assert ) {