Merge "Paranoia, escape image alignment parameters before outputting."

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

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index cd3f684..5af001e 100644 (file)
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -15,6 +15,8 @@
         * @cfg {string} savedQueriesPreferenceName Where to save the saved queries
         * @cfg {string} daysPreferenceName Preference name for the days filter
         * @cfg {string} limitPreferenceName Preference name for the limit filter
+        * @cfg {string} collapsedPreferenceName Preference name for collapsing and showing
+        *  the active filters area
         * @cfg {boolean} [normalizeTarget] Dictates whether or not to go through the
         *  title normalization to separate title subpage/parts into the target= url
         *  parameter
@@ -26,12 +28,13 @@
                this.savedQueriesPreferenceName = config.savedQueriesPreferenceName;
                this.daysPreferenceName = config.daysPreferenceName;
                this.limitPreferenceName = config.limitPreferenceName;
+               this.collapsedPreferenceName = config.collapsedPreferenceName;
                this.normalizeTarget = !!config.normalizeTarget;
 
                this.requestCounter = {};
                this.baseFilterState = {};
                this.uriProcessor = null;
-               this.initializing = false;
+               this.initialized = false;
                this.wereSavedQueriesSaved = false;
 
                this.prevLoggedItems = [];
@@ -240,16 +243,6 @@
                        }
                }
 
-               // Check whether we need to load defaults.
-               // We do this by checking whether the current URI query
-               // contains any parameters recognized by the system.
-               // If it does, we load the given state.
-               // If it doesn't, we have no values at all, and we assume
-               // the user loads the base-page and we load defaults.
-               // Defaults should only be applied on load (if necessary)
-               // or on request
-               this.initializing = true;
-
                if ( defaultSavedQueryExists ) {
                        // This came from the server, meaning that we have a default
                        // saved query, but the server could not load it, probably because
@@ -276,7 +269,7 @@
                        );
                }
 
-               this.initializing = false;
+               this.initialized = true;
                this.switchView( 'default' );
 
                this.pollingRate = mw.config.get( 'StructuredChangeFiltersLiveUpdatePollingRate' );
@@ -285,6 +278,14 @@
                }
        };
 
+       /**
+        * Check if the controller has finished initializing.
+        * @return {boolean} Controller is initialized
+        */
+       mw.rcfilters.Controller.prototype.isInitialized = function () {
+               return this.initialized;
+       };
+
        /**
         * Extracts information from the changes list DOM
         *
@@ -336,8 +337,8 @@
        /**
         * Create filter data from a number, for the filters that are numerical value
         *
-        * @param {Number} num Number
-        * @param {Number} numForDisplay Number for the label
+        * @param {number} num Number
+        * @param {number} numForDisplay Number for the label
         * @return {Object} Filter data
         */
        mw.rcfilters.Controller.prototype._createFilterDataFromNumber = function ( num, numForDisplay ) {
@@ -874,6 +875,15 @@
                this.updateNumericPreference( 'usenewrc', Number( newValue ) );
        };
 
+       /**
+        * Update the collapsed state value
+        *
+        * @param {boolean} isCollapsed Filter area is collapsed
+        */
+       mw.rcfilters.Controller.prototype.updateCollapsedState = function ( isCollapsed ) {
+               this.updateNumericPreference( this.collapsedPreferenceName, Number( isCollapsed ) );
+       };
+
        /**
         * Update a numeric preference with a new value
         *