From: Moriel Schottlender <moriel@gmail.com>
Date: Tue, 27 Jun 2017 00:17:19 +0000 (-0700)
Subject: RCFilters: Make extra filters footer non-sticky
X-Git-Tag: 1.31.0-rc.0~2881^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/modifier.php?a=commitdiff_plain;h=7e1fe88494d105d38c9fcce2a2e3a0bd523eff54;p=lhc%2Fweb%2Fwiklou.git

RCFilters: Make extra filters footer non-sticky

Bug: T168851
Change-Id: I504847e4b07d473786a4026b053a55ae460897e8
---

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 70381f22eb..0ab459e73d 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -47,6 +47,7 @@
 				footers: [
 					{
 						name: 'viewSelect',
+						sticky: false,
 						// View select menu, appears on default view only
 						$element: $( '<div>' )
 							.append( new mw.rcfilters.ui.ViewSwitchWidget( this.controller, this.model ).$element ),
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
index c70e00b471..cc63fb6751 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
@@ -82,17 +82,23 @@
 		// based on view
 		config.footers = config.footers || [];
 		config.footers.forEach( function ( footerData ) {
-			var adjustedData = {
-				// Wrap the element with our own footer wrapper
-				$element: $( '<div>' )
-					.addClass( 'mw-rcfilters-ui-menuSelectWidget-footer' )
-					.addClass( 'mw-rcfilters-ui-menuSelectWidget-footer-' + footerData.name )
-					.append( footerData.$element ),
-				views: footerData.views
-			};
+			var isSticky = footerData.sticky === undefined ? true : !!footerData.sticky,
+				adjustedData = {
+					// Wrap the element with our own footer wrapper
+					$element: $( '<div>' )
+						.addClass( 'mw-rcfilters-ui-menuSelectWidget-footer' )
+						.addClass( 'mw-rcfilters-ui-menuSelectWidget-footer-' + footerData.name )
+						.append( footerData.$element ),
+					views: footerData.views
+				};
 
 			this.footers.push( adjustedData );
-			this.$element.append( adjustedData.$element );
+
+			if ( isSticky ) {
+				this.$element.append( adjustedData.$element );
+			} else {
+				this.$body.append( adjustedData.$element );
+			}
 		}.bind( this ) );
 
 		// Switch to the correct view