X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki.rcfilters%2Fui%2Fmw.rcfilters.ui.FilterWrapperWidget.js;h=567d86d6ce3ea68cae3ae7214dfa3677fc946e77;hb=add9bd191fd4d16250b301208600854cb52f6b33;hp=1cd7befe6df4f23f2b8eeaa9e1db87fd6da5a4ba;hpb=7c65b479bf8571dbca0eea87cf3b708571071fb6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
index 1cd7befe6d..567d86d6ce 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * List displaying all filter groups
 	 *
@@ -13,6 +13,9 @@
 	 * @param {Object} [config] Configuration object
 	 * @cfg {Object} [filters] A definition of the filter groups in this list
 	 * @cfg {jQuery} [$overlay] A jQuery object serving as overlay for popups
+	 * @cfg {jQuery} [$wrapper] A jQuery object for the wrapper of the general
+	 *  system. If not given, falls back to this widget's $element
+	 * @cfg {boolean} [collapsed] Filter area is collapsed
 	 */
 	mw.rcfilters.ui.FilterWrapperWidget = function MwRcfiltersUiFilterWrapperWidget(
 		controller, model, savedQueriesModel, changesListModel, config
@@ -30,12 +33,17 @@
 		this.queriesModel = savedQueriesModel;
 		this.changesListModel = changesListModel;
 		this.$overlay = config.$overlay || this.$element;
+		this.$wrapper = config.$wrapper || this.$element;
 
 		this.filterTagWidget = new mw.rcfilters.ui.FilterTagMultiselectWidget(
 			this.controller,
 			this.model,
 			this.queriesModel,
-			{ $overlay: this.$overlay }
+			{
+				$overlay: this.$overlay,
+				collapsed: config.collapsed,
+				$wrapper: this.$wrapper
+			}
 		);
 
 		this.liveUpdateButton = new mw.rcfilters.ui.LiveUpdateButtonWidget(
@@ -43,7 +51,7 @@
 			this.changesListModel
 		);
 
-		this.numChangesWidget = new mw.rcfilters.ui.ChangesLimitAndDateButtonWidget(
+		this.numChangesAndDateWidget = new mw.rcfilters.ui.ChangesLimitAndDateButtonWidget(
 			this.controller,
 			this.model,
 			{
@@ -59,6 +67,12 @@
 			classes: [ 'mw-rcfilters-ui-filterWrapperWidget-showNewChanges' ]
 		} );
 
+		// Events
+		this.filterTagWidget.menu.connect( this, { toggle: [ 'emit', 'menuToggle' ] } );
+		this.changesListModel.connect( this, { newChangesExist: 'onNewChangesExist' } );
+		this.showNewChangesLink.connect( this, { click: 'onShowNewChangesClick' } );
+		this.showNewChangesLink.toggle( false );
+
 		// Initialize
 		this.$top = $( '<div>' )
 			.addClass( 'mw-rcfilters-ui-filterWrapperWidget-top' );
@@ -67,19 +81,13 @@
 			.addClass( 'mw-rcfilters-ui-filterWrapperWidget-bottom' )
 			.append(
 				this.showNewChangesLink.$element,
-				this.numChangesWidget.$element
+				this.numChangesAndDateWidget.$element
 			);
 
-		if ( mw.rcfilters.featureFlags.liveUpdate ) {
+		if ( mw.config.get( 'StructuredChangeFiltersLiveUpdatePollingRate' ) ) {
 			$bottom.prepend( this.liveUpdateButton.$element );
 		}
 
-		// Events
-		this.filterTagWidget.menu.connect( this, { toggle: [ 'emit', 'menuToggle' ] } );
-		this.changesListModel.connect( this, { newChangesExist: 'onNewChangesExist' } );
-		this.showNewChangesLink.connect( this, { click: 'onShowNewChangesClick' } );
-		this.showNewChangesLink.toggle( false );
-
 		this.$element
 			.addClass( 'mw-rcfilters-ui-filterWrapperWidget' )
 			.append(
@@ -120,4 +128,4 @@
 	mw.rcfilters.ui.FilterWrapperWidget.prototype.onNewChangesExist = function ( newChangesExist ) {
 		this.showNewChangesLink.toggle( newChangesExist );
 	};
-}( mediaWiki ) );
+}() );