Merge "Adjust print styles for thumb"

[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 b7852d0..ba61ba9 100644 (file)
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
@@ -234,12 +234,22 @@
                // wiki default.
                // Any subsequent change of the URL through the RCFilters
                // system will receive 'urlversion=2'
-               var base = this.getVersion( uriQuery ) === 2 ?
-                       {} :
-                       this.filtersModel.getDefaultParams();
+               var hiddenParamDefaults = {},
+                       base = this.getVersion( uriQuery ) === 2 ?
+                               {} :
+                               this.filtersModel.getDefaultParams();
+
+               // Go over the model and get all hidden parameters' defaults
+               // These defaults should be applied regardless of the urlversion
+               // but be overridden by the URL params if they exist
+               $.each( this.filtersModel.getFilterGroups(), function ( groupName, groupModel ) {
+                       if ( groupModel.isHidden() ) {
+                               $.extend( true, hiddenParamDefaults, groupModel.getDefaultParams() );
+                       }
+               } );
 
                return this.minimizeQuery(
-                       $.extend( true, {}, base, uriQuery, { urlversion: '2' } )
+                       $.extend( true, {}, hiddenParamDefaults, base, uriQuery, { urlversion: '2' } )
                );
        };
 
@@ -250,7 +260,8 @@
         * @return {Object} Empty parameter state
         */
        mw.rcfilters.UriProcessor.prototype._getEmptyParameterState = function () {
-               return this.emptyParameterState;
+               // Override empty parameter state with the sticky parameter values
+               return $.extend( true, {}, this.emptyParameterState, this.filtersModel.getStickyParams() );
        };
 
        /**