Merge "Use HTML::hidden to create input fields"

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

diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index 5cca5d8..6acc44d 100644 (file)
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -13,10 +13,17 @@
         *  is a part of.
         * @cfg {boolean} [isSticky] This group is using a 'sticky' default; meaning
         *  that every time a value is changed, it becomes the new default
+        * @cfg {boolean} [excludedFromSavedQueries] A specific requirement to exclude
+        *  this filter from saved queries. This is always true if the filter is 'sticky'
+        *  but can be used for non-sticky filters as an additional requirement. Similarly
+        *  to 'sticky' it works for the entire group as a whole.
         * @cfg {string} [title] Group title
         * @cfg {boolean} [hidden] This group is hidden from the regular menu views
         * @cfg {boolean} [allowArbitrary] Allows for an arbitrary value to be added to the
         *  group from the URL, even if it wasn't initially set up.
+        * @cfg {number} [range] An object defining minimum and maximum values for numeric
+        *  groups. { min: x, max: y }
+        * @cfg {number} [minValue] Minimum value for numeric groups
         * @cfg {string} [separator='|'] Value separator for 'string_options' groups
         * @cfg {boolean} [active] Group is active
         * @cfg {boolean} [fullCoverage] This filters in this group collectively cover all results
@@ -41,9 +48,11 @@
                this.type = config.type || 'send_unselected_if_any';
                this.view = config.view || 'default';
                this.sticky = !!config.isSticky;
+               this.excludedFromSavedQueries = this.sticky || !!config.excludedFromSavedQueries;
                this.title = config.title || name;
                this.hidden = !!config.hidden;
                this.allowArbitrary = !!config.allowArbitrary;
+               this.numericRange = config.range;
                this.separator = config.separator || '|';
                this.labelPrefixKey = config.labelPrefixKey;
 
@@ -142,7 +151,7 @@
                                // Store the default parameter state
                                // For this group type, parameter values are direct
                                // We need to convert from a boolean to a string ('1' and '0')
-                               model.defaultParams[ filter.name ] = String( Number( !!filter.default ) );
+                               model.defaultParams[ filter.name ] = String( Number( filter.default || 0 ) );
                        }
                } );
 
@@ -288,6 +297,26 @@
                return this.allowArbitrary;
        };
 
+       /**
+        * Get group maximum value for numeric groups
+        *
+        * @return {number|null} Group max value
+        */
+       mw.rcfilters.dm.FilterGroup.prototype.getMaxValue = function () {
+               return this.numericRange && this.numericRange.max !== undefined ?
+                       this.numericRange.max : null;
+       };
+
+       /**
+        * Get group minimum value for numeric groups
+        *
+        * @return {number|null} Group max value
+        */
+       mw.rcfilters.dm.FilterGroup.prototype.getMinValue = function () {
+               return this.numericRange && this.numericRange.min !== undefined ?
+                       this.numericRange.min : null;
+       };
+
        /**
         * Get group name
         *
@@ -712,11 +741,11 @@
                        this.getType() === 'single_option' &&
                        !oneWasSelected
                ) {
+                       item = this.getItems()[ 0 ];
                        if ( defaultParams[ this.getName() ] ) {
                                item = this.getItemByParamName( defaultParams[ this.getName() ] );
-                       } else {
-                               item = this.getItems()[ 0 ];
                        }
+
                        result[ item.getName() ] = true;
                }
 
@@ -846,4 +875,13 @@
        mw.rcfilters.dm.FilterGroup.prototype.isSticky = function () {
                return this.sticky;
        };
+
+       /**
+        * Check whether the group value is excluded from saved queries
+        *
+        * @return {boolean} Group value is excluded from saved queries
+        */
+       mw.rcfilters.dm.FilterGroup.prototype.isExcludedFromSavedQueries = function () {
+               return this.excludedFromSavedQueries;
+       };
 }( mediaWiki ) );