Merge "RCFilters: Make extra filters footer non-sticky"

diff --combined resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
index 74f8bcd,cc63fb6..c12e10e
--- 1/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
--- 2/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 +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
@@@ -134,50 -140,46 +140,50 @@@
  
                // Count groups per view
                $.each( groups, function ( groupName, groupModel ) {
 -                      viewGroupCount[ groupModel.getView() ] = viewGroupCount[ groupModel.getView() ] || 0;
 -                      viewGroupCount[ groupModel.getView() ]++;
 +                      if ( !groupModel.isHidden() ) {
 +                              viewGroupCount[ groupModel.getView() ] = viewGroupCount[ groupModel.getView() ] || 0;
 +                              viewGroupCount[ groupModel.getView() ]++;
 +                      }
                } );
  
                $.each( groups, function ( groupName, groupModel ) {
                        var currentItems = [],
                                view = groupModel.getView();
  
 -                      if ( viewGroupCount[ view ] > 1 ) {
 -                              // Only add a section header if there is more than
 -                              // one group
 -                              currentItems.push(
 -                                      // Group section
 -                                      new mw.rcfilters.ui.FilterMenuSectionOptionWidget(
 -                                              widget.controller,
 -                                              groupModel,
 -                                              {
 -                                                      $overlay: widget.$overlay
 -                                              }
 -                                      )
 -                              );
 +                      if ( !groupModel.isHidden() ) {
 +                              if ( viewGroupCount[ view ] > 1 ) {
 +                                      // Only add a section header if there is more than
 +                                      // one group
 +                                      currentItems.push(
 +                                              // Group section
 +                                              new mw.rcfilters.ui.FilterMenuSectionOptionWidget(
 +                                                      widget.controller,
 +                                                      groupModel,
 +                                                      {
 +                                                              $overlay: widget.$overlay
 +                                                      }
 +                                              )
 +                                      );
 +                              }
 +
 +                              // Add items
 +                              widget.model.getGroupFilters( groupName ).forEach( function ( filterItem ) {
 +                                      currentItems.push(
 +                                              new mw.rcfilters.ui.FilterMenuOptionWidget(
 +                                                      widget.controller,
 +                                                      filterItem,
 +                                                      {
 +                                                              $overlay: widget.$overlay
 +                                                      }
 +                                              )
 +                                      );
 +                              } );
 +
 +                              // Cache the items per view, so we can switch between them
 +                              // without rebuilding the widgets each time
 +                              widget.views[ view ] = widget.views[ view ] || [];
 +                              widget.views[ view ] = widget.views[ view ].concat( currentItems );
                        }
 -
 -                      // Add items
 -                      widget.model.getGroupFilters( groupName ).forEach( function ( filterItem ) {
 -                              currentItems.push(
 -                                      new mw.rcfilters.ui.FilterMenuOptionWidget(
 -                                              widget.controller,
 -                                              filterItem,
 -                                              {
 -                                                      $overlay: widget.$overlay
 -                                              }
 -                                      )
 -                              );
 -                      } );
 -
 -                      // Cache the items per view, so we can switch between them
 -                      // without rebuilding the widgets each time
 -                      widget.views[ view ] = widget.views[ view ] || [];
 -                      widget.views[ view ] = widget.views[ view ].concat( currentItems );
                } );
  
                this.switchView( this.model.getCurrentView() );